From f569792df8a25caa1bed9c448c8c4c3f837f5164 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 27 Apr 2020 18:09:41 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/explore_helper.rb | 2 +- app/helpers/projects/alert_management_helper.rb | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb index b66c7a69b71..026dbd60ac6 100644 --- a/app/helpers/explore_helper.rb +++ b/app/helpers/explore_helper.rb @@ -52,7 +52,7 @@ module ExploreHelper end def public_visibility_restricted? - Gitlab::CurrentSettings.restricted_visibility_levels&.include? Gitlab::VisibilityLevel::PUBLIC + Gitlab::VisibilityLevel.public_visibility_restricted? end private diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb index 1b0400fbaa5..6aadc18ac3a 100644 --- a/app/helpers/projects/alert_management_helper.rb +++ b/app/helpers/projects/alert_management_helper.rb @@ -1,12 +1,14 @@ # frozen_string_literal: true module Projects::AlertManagementHelper - def alert_management_data(project) + def alert_management_data(current_user, project) { 'index-path' => project_alert_management_index_path(project, format: :json), 'enable-alert-management-path' => project_settings_operations_path(project), - 'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg') + 'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'), + 'user-can-enable-alert-management' => 'false', + 'alert-management-enabled' => Feature.enabled?(:alert_management_minimal, project).to_s } end end -- cgit v1.2.3