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
345f41d9
Commit
345f41d9
authored
Sep 30, 2020
by
Sarah Yasonik
Committed by
Mayra Cabrera
Sep 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Inherit viewability of incidents from issues
parent
fe976e4e
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
121 additions
and
24 deletions
+121
-24
app/controllers/projects/incidents_controller.rb
app/controllers/projects/incidents_controller.rb
+1
-1
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+9
-2
app/policies/project_policy.rb
app/policies/project_policy.rb
+0
-1
app/views/layouts/nav/sidebar/_project.html.haml
app/views/layouts/nav/sidebar/_project.html.haml
+5
-5
changelogs/unreleased/sy-allow-guests-to-view-incidents.yml
changelogs/unreleased/sy-allow-guests-to-view-incidents.yml
+5
-0
doc/operations/incident_management/incidents.md
doc/operations/incident_management/incidents.md
+1
-1
spec/controllers/projects/incidents_controller_spec.rb
spec/controllers/projects/incidents_controller_spec.rb
+10
-12
spec/features/operations_sidebar_link_spec.rb
spec/features/operations_sidebar_link_spec.rb
+81
-0
spec/features/projects/user_sees_sidebar_spec.rb
spec/features/projects/user_sees_sidebar_spec.rb
+1
-1
spec/helpers/projects_helper_spec.rb
spec/helpers/projects_helper_spec.rb
+8
-1
No files found.
app/controllers/projects/incidents_controller.rb
View file @
345f41d9
# frozen_string_literal: true
# frozen_string_literal: true
class
Projects::IncidentsController
<
Projects
::
ApplicationController
class
Projects::IncidentsController
<
Projects
::
ApplicationController
before_action
:authorize_read_i
ncidents
!
before_action
:authorize_read_i
ssue
!
def
index
def
index
end
end
...
...
app/helpers/projects_helper.rb
View file @
345f41d9
...
@@ -468,7 +468,7 @@ module ProjectsHelper
...
@@ -468,7 +468,7 @@ module ProjectsHelper
serverless: :read_cluster
,
serverless: :read_cluster
,
error_tracking: :read_sentry_issue
,
error_tracking: :read_sentry_issue
,
alert_management: :read_alert_management_alert
,
alert_management: :read_alert_management_alert
,
incidents: :read_i
ncidents
,
incidents: :read_i
ssue
,
labels: :read_label
,
labels: :read_label
,
issues: :read_issue
,
issues: :read_issue
,
project_members: :read_project_member
,
project_members: :read_project_member
,
...
@@ -477,7 +477,14 @@ module ProjectsHelper
...
@@ -477,7 +477,14 @@ module ProjectsHelper
end
end
def
can_view_operations_tab?
(
current_user
,
project
)
def
can_view_operations_tab?
(
current_user
,
project
)
[
:read_environment
,
:read_cluster
,
:metrics_dashboard
].
any?
do
|
ability
|
[
:metrics_dashboard
,
:read_alert_management_alert
,
:read_environment
,
:read_issue
,
:read_sentry_issue
,
:read_cluster
].
any?
do
|
ability
|
can?
(
current_user
,
ability
,
project
)
can?
(
current_user
,
ability
,
project
)
end
end
end
end
...
...
app/policies/project_policy.rb
View file @
345f41d9
...
@@ -237,7 +237,6 @@ class ProjectPolicy < BasePolicy
...
@@ -237,7 +237,6 @@ class ProjectPolicy < BasePolicy
enable
:read_merge_request
enable
:read_merge_request
enable
:read_sentry_issue
enable
:read_sentry_issue
enable
:update_sentry_issue
enable
:update_sentry_issue
enable
:read_incidents
enable
:read_prometheus
enable
:read_prometheus
enable
:read_metrics_dashboard_annotation
enable
:read_metrics_dashboard_annotation
enable
:metrics_dashboard
enable
:metrics_dashboard
...
...
app/views/layouts/nav/sidebar/_project.html.haml
View file @
345f41d9
...
@@ -235,11 +235,11 @@
...
@@ -235,11 +235,11 @@
%span
%span
=
_
(
'Alerts'
)
=
_
(
'Alerts'
)
-
if
project_nav_tab?
(
:incidents
)
-
if
project_nav_tab?
(
:incidents
)
=
nav_link
(
controller: :incidents
)
do
=
nav_link
(
controller: :incidents
)
do
=
link_to
project_incidents_path
(
@project
),
title:
_
(
'Incidents'
),
data:
{
qa_selector:
'operations_incidents_link'
}
do
=
link_to
project_incidents_path
(
@project
),
title:
_
(
'Incidents'
),
data:
{
qa_selector:
'operations_incidents_link'
}
do
%span
%span
=
_
(
'Incidents'
)
=
_
(
'Incidents'
)
-
if
project_nav_tab?
:environments
-
if
project_nav_tab?
:environments
=
render_if_exists
"layouts/nav/sidebar/tracing_link"
=
render_if_exists
"layouts/nav/sidebar/tracing_link"
...
...
changelogs/unreleased/sy-allow-guests-to-view-incidents.yml
0 → 100644
View file @
345f41d9
---
title
:
Show incident list for users who can read issues
merge_request
:
43060
author
:
type
:
fixed
doc/operations/incident_management/incidents.md
View file @
345f41d9
...
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
...
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
While no configuration is required to use the
[
manual features
](
#create-an-incident-manually
)
While no configuration is required to use the
[
manual features
](
#create-an-incident-manually
)
of incident management, some simple
[
configuration
](
#configure-incidents
)
is needed to automate incident creation.
of incident management, some simple
[
configuration
](
#configure-incidents
)
is needed to automate incident creation.
For users with at least
Reporter
[
permissions
](
../../user/permissions.md
)
, the
For users with at least
Guest
[
permissions
](
../../user/permissions.md
)
, the
Incident Management list is available at
**Operations > Incidents**
Incident Management list is available at
**Operations > Incidents**
in your project's sidebar. The list contains the following metrics:
in your project's sidebar. The list contains the following metrics:
...
...
spec/controllers/projects/incidents_controller_spec.rb
View file @
345f41d9
...
@@ -8,8 +8,8 @@ RSpec.describe Projects::IncidentsController do
...
@@ -8,8 +8,8 @@ RSpec.describe Projects::IncidentsController do
let_it_be
(
:guest
)
{
create
(
:user
)
}
let_it_be
(
:guest
)
{
create
(
:user
)
}
before_all
do
before_all
do
project
.
add_developer
(
developer
)
project
.
add_guest
(
guest
)
project
.
add_guest
(
guest
)
project
.
add_developer
(
developer
)
end
end
describe
'GET #index'
do
describe
'GET #index'
do
...
@@ -17,7 +17,15 @@ RSpec.describe Projects::IncidentsController do
...
@@ -17,7 +17,15 @@ RSpec.describe Projects::IncidentsController do
get
:index
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
}
get
:index
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
}
end
end
it
'shows the page for user with developer role'
do
it
'shows the page for users with guest role'
do
sign_in
(
guest
)
make_request
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
render_template
(
:index
)
end
it
'shows the page for users with developer role'
do
sign_in
(
developer
)
sign_in
(
developer
)
make_request
make_request
...
@@ -27,20 +35,10 @@ RSpec.describe Projects::IncidentsController do
...
@@ -27,20 +35,10 @@ RSpec.describe Projects::IncidentsController do
context
'when user is unauthorized'
do
context
'when user is unauthorized'
do
it
'redirects to the login page'
do
it
'redirects to the login page'
do
sign_out
(
developer
)
make_request
make_request
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
end
end
end
end
context
'when user is a guest'
do
it
'shows 404'
do
sign_in
(
guest
)
make_request
expect
(
response
).
to
have_gitlab_http_status
(
:not_found
)
end
end
end
end
end
end
spec/features/operations_sidebar_link_spec.rb
0 → 100644
View file @
345f41d9
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
'Operations dropdown sidebar'
do
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
project
.
add_role
(
user
,
role
)
sign_in
(
user
)
visit
project_issues_path
(
project
)
end
context
'user has guest role'
do
let
(
:role
)
{
:guest
}
it
'has the correct `Operations` menu items'
do
expect
(
page
).
to
have_link
(
title:
'Incidents'
,
href:
project_incidents_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Metrics'
,
href:
project_metrics_dashboard_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Alerts'
,
href:
project_alert_management_index_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Environments'
,
href:
project_environments_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Error Tracking'
,
href:
project_error_tracking_index_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Product Analytics'
,
href:
project_product_analytics_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Serverless'
,
href:
project_serverless_functions_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Logs'
,
href:
project_logs_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Kubernetes'
,
href:
project_clusters_path
(
project
))
end
end
context
'user has reporter role'
do
let
(
:role
)
{
:reporter
}
it
'has the correct `Operations` menu items'
do
expect
(
page
).
to
have_link
(
title:
'Metrics'
,
href:
project_metrics_dashboard_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Incidents'
,
href:
project_incidents_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Environments'
,
href:
project_environments_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Error Tracking'
,
href:
project_error_tracking_index_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Product Analytics'
,
href:
project_product_analytics_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Alerts'
,
href:
project_alert_management_index_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Serverless'
,
href:
project_serverless_functions_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Logs'
,
href:
project_logs_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Kubernetes'
,
href:
project_clusters_path
(
project
))
end
end
context
'user has developer role'
do
let
(
:role
)
{
:developer
}
it
'has the correct `Operations` menu items'
do
expect
(
page
).
to
have_link
(
title:
'Metrics'
,
href:
project_metrics_dashboard_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Alerts'
,
href:
project_alert_management_index_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Incidents'
,
href:
project_incidents_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Environments'
,
href:
project_environments_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Error Tracking'
,
href:
project_error_tracking_index_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Product Analytics'
,
href:
project_product_analytics_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Logs'
,
href:
project_logs_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Serverless'
,
href:
project_serverless_functions_path
(
project
))
expect
(
page
).
not_to
have_link
(
title:
'Kubernetes'
,
href:
project_clusters_path
(
project
))
end
end
context
'user has maintainer role'
do
let
(
:role
)
{
:maintainer
}
it
'has the correct `Operations` menu items'
do
expect
(
page
).
to
have_link
(
title:
'Metrics'
,
href:
project_metrics_dashboard_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Alerts'
,
href:
project_alert_management_index_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Incidents'
,
href:
project_incidents_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Environments'
,
href:
project_environments_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Error Tracking'
,
href:
project_error_tracking_index_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Product Analytics'
,
href:
project_product_analytics_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Serverless'
,
href:
project_serverless_functions_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Logs'
,
href:
project_logs_path
(
project
))
expect
(
page
).
to
have_link
(
title:
'Kubernetes'
,
href:
project_clusters_path
(
project
))
end
end
end
spec/features/projects/user_sees_sidebar_spec.rb
View file @
345f41d9
...
@@ -145,11 +145,11 @@ RSpec.describe 'Projects > User sees sidebar' do
...
@@ -145,11 +145,11 @@ RSpec.describe 'Projects > User sees sidebar' do
expect
(
page
).
to
have_content
'Project'
expect
(
page
).
to
have_content
'Project'
expect
(
page
).
to
have_content
'Issues'
expect
(
page
).
to
have_content
'Issues'
expect
(
page
).
to
have_content
'Wiki'
expect
(
page
).
to
have_content
'Wiki'
expect
(
page
).
to
have_content
'Operations'
expect
(
page
).
not_to
have_content
'Repository'
expect
(
page
).
not_to
have_content
'Repository'
expect
(
page
).
not_to
have_content
'CI / CD'
expect
(
page
).
not_to
have_content
'CI / CD'
expect
(
page
).
not_to
have_content
'Merge Requests'
expect
(
page
).
not_to
have_content
'Merge Requests'
expect
(
page
).
not_to
have_content
'Operations'
end
end
end
end
...
...
spec/helpers/projects_helper_spec.rb
View file @
345f41d9
...
@@ -524,7 +524,14 @@ RSpec.describe ProjectsHelper do
...
@@ -524,7 +524,14 @@ RSpec.describe ProjectsHelper do
subject
{
helper
.
send
(
:can_view_operations_tab?
,
user
,
project
)
}
subject
{
helper
.
send
(
:can_view_operations_tab?
,
user
,
project
)
}
[
:read_environment
,
:read_cluster
,
:metrics_dashboard
].
each
do
|
ability
|
[
:metrics_dashboard
,
:read_alert_management_alert
,
:read_environment
,
:read_issue
,
:read_sentry_issue
,
:read_cluster
].
each
do
|
ability
|
it
'includes operations tab'
do
it
'includes operations tab'
do
allow
(
helper
).
to
receive
(
:can?
).
and_return
(
false
)
allow
(
helper
).
to
receive
(
:can?
).
and_return
(
false
)
allow
(
helper
).
to
receive
(
:can?
).
with
(
user
,
ability
,
project
).
and_return
(
true
)
allow
(
helper
).
to
receive
(
:can?
).
with
(
user
,
ability
,
project
).
and_return
(
true
)
...
...
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