diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
commit | 120f4aaedc8fe830a3f572491d240d8ee6addefb (patch) | |
tree | a2138baa55dfa67d292fb1a83ce686ee7f5d10a5 /app/helpers | |
parent | 729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/broadcast_messages_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/services_helper.rb | 4 | ||||
-rw-r--r-- | app/helpers/user_callouts_helper.rb | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb index 73c68dd9e18..0c32b48a85a 100644 --- a/app/helpers/broadcast_messages_helper.rb +++ b/app/helpers/broadcast_messages_helper.rb @@ -48,7 +48,7 @@ module BroadcastMessagesHelper def render_broadcast_message(broadcast_message) if Feature.enabled?(:broadcast_message_placeholders) - Banzai.render_and_post_process(broadcast_message.message, { + Banzai.render_field_and_post_process(broadcast_message, :message, { current_user: current_user, skip_project_check: true, broadcast_message_placeholders: true diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index caef6dba212..d2336de7193 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -62,6 +62,10 @@ module ServicesHelper !current_controller?("admin/services") && service.deprecated? end + def edit_integration_path(integration) + edit_admin_application_settings_integration_path(integration) + end + extend self end diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb index 841599abe81..34c8ce51df0 100644 --- a/app/helpers/user_callouts_helper.rb +++ b/app/helpers/user_callouts_helper.rb @@ -1,12 +1,17 @@ # frozen_string_literal: true module UserCalloutsHelper + ADMIN_INTEGRATIONS_MOVED = 'admin_integrations_moved' GKE_CLUSTER_INTEGRATION = 'gke_cluster_integration' GCP_SIGNUP_OFFER = 'gcp_signup_offer' SUGGEST_POPOVER_DISMISSED = 'suggest_popover_dismissed' TABS_POSITION_HIGHLIGHT = 'tabs_position_highlight' WEBHOOKS_MOVED = 'webhooks_moved' + def show_admin_integrations_moved? + !user_dismissed?(ADMIN_INTEGRATIONS_MOVED) + end + def show_gke_cluster_integration_callout?(project) can?(current_user, :create_cluster, project) && !user_dismissed?(GKE_CLUSTER_INTEGRATION) |