diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 02:24:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 02:24:31 +0300 |
| commit | 83380b5e7f6489d6429af539ebd2fd1bb973d90f (patch) | |
| tree | 60df92052073f1619b2b3515b5aa3d928fc60f9c /app | |
| parent | 21585f82e753689cc46f59c02d8e207756d794bf (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-8-stable-ee
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 1 | ||||
| -rw-r--r-- | app/policies/project_policy.rb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index e44c00e501e..ae8b3d9b51d 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -9,6 +9,7 @@ class Projects::PipelinesController < Projects::ApplicationController before_action :set_pipeline_path, only: [:show] before_action :authorize_read_pipeline! before_action :authorize_read_build!, only: [:index] + before_action :authorize_read_analytics!, only: [:charts] before_action :authorize_create_pipeline!, only: [:new, :create, :config_variables] before_action :authorize_update_pipeline!, only: [:retry, :cancel] before_action do diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index 03cb53f55be..6135523a2f8 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -218,6 +218,7 @@ class ProjectPolicy < BasePolicy enable :read_pages_content enable :read_release enable :read_analytics + enable :read_insights end # These abilities are not allowed to admins that are not members of the project, @@ -447,6 +448,9 @@ class ProjectPolicy < BasePolicy rule { analytics_disabled }.policy do prevent(:read_analytics) + prevent(:read_insights) + prevent(:read_cycle_analytics) + prevent(:read_repository_graphs) end rule { wiki_disabled }.policy do @@ -520,6 +524,7 @@ class ProjectPolicy < BasePolicy enable :read_cycle_analytics enable :read_pages_content enable :read_analytics + enable :read_insights # NOTE: may be overridden by IssuePolicy enable :read_issue |