diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:05 +0300 |
| commit | c2367afbf57ebc65d5b78a743b5d6a91f0aece9f (patch) | |
| tree | 165c2c54bf72ab3a3a9417d97f63ece5c9eba9f5 /app/helpers | |
| parent | 51a9512965d86e3094968fa514e4ae8a96d38cf3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects_helper.rb | 3 | ||||
| -rw-r--r-- | app/helpers/user_callouts_helper.rb | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 5aff12621b5..cf9f3b9e924 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -669,6 +669,9 @@ module ProjectsHelper project_members#index integrations#show services#edit + hooks#index + hooks#edit + hook_logs#show repository#show ci_cd#show operations#show diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb index ab691916706..841599abe81 100644 --- a/app/helpers/user_callouts_helper.rb +++ b/app/helpers/user_callouts_helper.rb @@ -5,6 +5,7 @@ module UserCalloutsHelper GCP_SIGNUP_OFFER = 'gcp_signup_offer' SUGGEST_POPOVER_DISMISSED = 'suggest_popover_dismissed' TABS_POSITION_HIGHLIGHT = 'tabs_position_highlight' + WEBHOOKS_MOVED = 'webhooks_moved' def show_gke_cluster_integration_callout?(project) can?(current_user, :create_cluster, project) && @@ -33,6 +34,10 @@ module UserCalloutsHelper current_user && !user_dismissed?(TABS_POSITION_HIGHLIGHT) && !Rails.env.test? end + def show_webhooks_moved_alert? + !user_dismissed?(WEBHOOKS_MOVED) + end + private def user_dismissed?(feature_name, ignore_dismissal_earlier_than = nil) |