diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-13 03:09:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-13 03:09:16 +0300 |
commit | aa64fed495bb15fd838be8ef17128988f78e240c (patch) | |
tree | aae87ffa3fa19ffc1abffc518b5bd694b2cab8b4 /app/helpers | |
parent | 963c6277b29b205c38c24fa907dda933097fbd25 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/projects_helper.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index b5c4e0b5550..6c17039a5d9 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -379,13 +379,8 @@ module ProjectsHelper private def can_read_security_configuration?(project, current_user) - show_security_and_compliance_config? && - can?(current_user, :access_security_and_compliance, project) && - can?(current_user, :read_security_configuration, project) - end - - def show_security_and_compliance_config? - ::Feature.enabled?(:secure_security_and_compliance_configuration_page_on_ce, @subject, default_enabled: :yaml) + 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) @@ -674,13 +669,10 @@ module ProjectsHelper pagesAvailable: Gitlab.config.pages.enabled, pagesAccessControlEnabled: Gitlab.config.pages.access_control, pagesAccessControlForced: ::Gitlab::Pages.access_control_is_forced?, - pagesHelpPath: help_page_path('user/project/pages/introduction', anchor: 'gitlab-pages-access-control'), - securityAndComplianceAvailable: show_security_and_compliance_toggle? + pagesHelpPath: help_page_path('user/project/pages/introduction', anchor: 'gitlab-pages-access-control') } end - alias_method :show_security_and_compliance_toggle?, :show_security_and_compliance_config? - def project_permissions_panel_data_json(project) project_permissions_panel_data(project).to_json.html_safe end |