diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
| commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
| tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /app/serializers/merge_request_widget_entity.rb | |
| parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) | |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'app/serializers/merge_request_widget_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_widget_entity.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb index 1c033dee5ff..1e4289ce774 100644 --- a/app/serializers/merge_request_widget_entity.rb +++ b/app/serializers/merge_request_widget_entity.rb @@ -83,7 +83,10 @@ class MergeRequestWidgetEntity < Grape::Entity end expose :is_dismissed_suggest_pipeline do |_merge_request| - current_user && current_user.dismissed_callout?(feature_name: SUGGEST_PIPELINE) + next true unless current_user + next true unless Gitlab::CurrentSettings.suggest_pipeline_enabled? + + current_user.dismissed_callout?(feature_name: SUGGEST_PIPELINE) end expose :human_access do |merge_request| |