diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/helpers/projects_helper.rb | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
| download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/helpers/projects_helper.rb')
| -rw-r--r-- | app/helpers/projects_helper.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index f5cd89d96b4..6c17039a5d9 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -379,8 +379,8 @@ module ProjectsHelper private def can_read_security_configuration?(project, current_user) - ::Feature.enabled?(:secure_security_and_compliance_configuration_page_on_ce, @subject, default_enabled: :yaml) && - can?(current_user, :read_security_configuration, project) + can?(current_user, :access_security_and_compliance, project) && + can?(current_user, :read_security_configuration, project) end def get_project_security_nav_tabs(project, current_user) @@ -646,7 +646,8 @@ module ProjectsHelper metricsDashboardAccessLevel: feature.metrics_dashboard_access_level, operationsAccessLevel: feature.operations_access_level, showDefaultAwardEmojis: project.show_default_award_emojis?, - allowEditingCommitMessages: project.allow_editing_commit_messages? + allowEditingCommitMessages: project.allow_editing_commit_messages?, + securityAndComplianceAccessLevel: project.security_and_compliance_access_level } end |