Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
984e2c1d
Commit
984e2c1d
authored
Oct 07, 2020
by
David O'Regan
Committed by
Peter Leitzen
Oct 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove issue Incident feature flag
parent
a30d40df
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
46 deletions
+6
-46
app/assets/javascripts/incidents/components/incidents_list.vue
...ssets/javascripts/incidents/components/incidents_list.vue
+1
-6
app/controllers/projects/incidents_controller.rb
app/controllers/projects/incidents_controller.rb
+0
-9
changelogs/unreleased/257842-issue-incident-feature-flag-removal.yml
...unreleased/257842-issue-incident-feature-flag-removal.yml
+5
-0
config/feature_flags/development/issues_incident_details.yml
config/feature_flags/development/issues_incident_details.yml
+0
-7
spec/controllers/projects/incidents_controller_spec.rb
spec/controllers/projects/incidents_controller_spec.rb
+0
-8
spec/frontend/incidents/components/incidents_list_spec.js
spec/frontend/incidents/components/incidents_list_spec.js
+0
-16
No files found.
app/assets/javascripts/incidents/components/incidents_list.vue
View file @
984e2c1d
...
...
@@ -19,7 +19,6 @@ import Api from '~/api';
import
TimeAgoTooltip
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
import
FilteredSearchBar
from
'
~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
'
;
import
AuthorToken
from
'
~/vue_shared/components/filtered_search_bar/tokens/author_token.vue
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
{
convertToSnakeCase
}
from
'
~/lib/utils/text_utility
'
;
import
{
s__
,
__
}
from
'
~/locale
'
;
import
{
urlParamsToObject
}
from
'
~/lib/utils/common_utils
'
;
...
...
@@ -113,7 +112,6 @@ export default {
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
mixins
:
[
glFeatureFlagsMixin
()],
inject
:
[
'
projectPath
'
,
'
newIssuePath
'
,
...
...
@@ -335,10 +333,7 @@ export default {
return
Boolean
(
assignees
.
nodes
?.
length
);
},
navigateToIncidentDetails
({
iid
})
{
const
path
=
this
.
glFeatures
.
issuesIncidentDetails
?
joinPaths
(
this
.
issuePath
,
INCIDENT_DETAILS_PATH
)
:
this
.
issuePath
;
return
visitUrl
(
joinPaths
(
path
,
iid
));
return
visitUrl
(
joinPaths
(
this
.
issuePath
,
INCIDENT_DETAILS_PATH
,
iid
));
},
handlePageChange
(
page
)
{
const
{
startCursor
,
endCursor
}
=
this
.
incidents
.
pageInfo
;
...
...
app/controllers/projects/incidents_controller.rb
View file @
984e2c1d
...
...
@@ -5,13 +5,8 @@ class Projects::IncidentsController < Projects::ApplicationController
include
Gitlab
::
Utils
::
StrongMemoize
before_action
:authorize_read_issue!
before_action
:check_feature_flag
,
only:
[
:show
]
before_action
:load_incident
,
only:
[
:show
]
before_action
do
push_frontend_feature_flag
(
:issues_incident_details
,
@project
)
end
def
index
end
...
...
@@ -45,8 +40,4 @@ class Projects::IncidentsController < Projects::ApplicationController
def
serializer
IssueSerializer
.
new
(
current_user:
current_user
,
project:
incident
.
project
)
end
def
check_feature_flag
render_404
unless
Feature
.
enabled?
(
:issues_incident_details
,
@project
)
end
end
changelogs/unreleased/257842-issue-incident-feature-flag-removal.yml
0 → 100644
View file @
984e2c1d
---
title
:
Allow users to navigate to the incidents show details page wrapper through `/issues/incidents/:id` from the Incident list
merge_request
:
44438
author
:
type
:
changed
config/feature_flags/development/issues_incident_details.yml
deleted
100644 → 0
View file @
a30d40df
---
name
:
issues_incident_details
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43459
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/257842
type
:
development
group
:
group::health
default_enabled
:
false
spec/controllers/projects/incidents_controller_spec.rb
View file @
984e2c1d
...
...
@@ -83,14 +83,6 @@ RSpec.describe Projects::IncidentsController do
expect
(
assigns
(
:noteable
)).
to
eq
(
assigns
(
:incident
))
end
context
'with feature flag disabled'
do
before
do
stub_feature_flags
(
issues_incident_details:
false
)
end
it_behaves_like
'not found'
end
context
'with non existing id'
do
let
(
:resource
)
{
non_existing_record_id
}
...
...
spec/frontend/incidents/components/incidents_list_spec.js
View file @
984e2c1d
...
...
@@ -87,7 +87,6 @@ describe('Incidents List', () => {
textQuery
:
''
,
authorUsernamesQuery
:
''
,
assigneeUsernamesQuery
:
''
,
issuesIncidentDetails
:
false
,
},
stubs
:
{
GlButton
:
true
,
...
...
@@ -194,22 +193,7 @@ describe('Incidents List', () => {
expect
(
findSeverity
().
length
).
toBe
(
mockIncidents
.
length
);
});
it
(
'
contains a link to the issue details page
'
,
()
=>
{
findTableRows
()
.
at
(
0
)
.
trigger
(
'
click
'
);
expect
(
visitUrl
).
toHaveBeenCalledWith
(
joinPaths
(
`/project/issues/`
,
mockIncidents
[
0
].
iid
));
});
it
(
'
contains a link to the incident details page
'
,
async
()
=>
{
beforeEach
(()
=>
mountComponent
({
data
:
{
incidents
:
{
list
:
mockIncidents
},
incidentsCount
:
{}
},
loading
:
false
,
provide
:
{
glFeatures
:
{
issuesIncidentDetails
:
true
}
},
}),
);
findTableRows
()
.
at
(
0
)
.
trigger
(
'
click
'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment