diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-13 12:00:50 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-13 12:00:50 +0300 |
| commit | da4ca9f44caaa3876d2b6d2021366d2d0e035241 (patch) | |
| tree | f5ed3b81129c41c6d9bdcec6bf91068a73bfef73 /app/helpers | |
| parent | e19827ab3b9979324b978422978518d86ba3b3a9 (diff) | |
| parent | b1d5186d0a2d8ea2b594398fbcfe28acb3e8ed23 (diff) | |
Merge branch 'zj-feature-flipper-disable-banner' into 'master'
Allow all AutoDevOps banners to be disabled
Closes #37653
See merge request !14218
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/auto_devops_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/auto_devops_helper.rb b/app/helpers/auto_devops_helper.rb index 4ff38f86b5f..c132daed323 100644 --- a/app/helpers/auto_devops_helper.rb +++ b/app/helpers/auto_devops_helper.rb @@ -1,6 +1,7 @@ module AutoDevopsHelper def show_auto_devops_callout?(project) - show_callout?('auto_devops_settings_dismissed') && + Feature.get(:auto_devops_banner_disabled).off? && + show_callout?('auto_devops_settings_dismissed') && can?(current_user, :admin_pipeline, project) && project.has_auto_devops_implicitly_disabled? end |