diff options
| author | Dennis Tang <dennis@dennistang.net> | 2018-07-10 13:20:05 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-10 13:20:05 +0000 |
| commit | fe268175a20a517d31de7edd1701bcb35ecfae5b (patch) | |
| tree | 2a00eb3acd05009121757316594a76c24d3188a1 /app/helpers | |
| parent | 3d4873fa64c833c71ab7ee274002d854eb93ef96 (diff) | |
| download | gitlab-ce-fe268175a20a517d31de7edd1701bcb35ecfae5b.tar.gz | |
Resolve "Disable GCP free credit banner at instance level"
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 1 | ||||
| -rw-r--r-- | app/helpers/clusters_helper.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index ef1bf283d0c..358b896702b 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -251,6 +251,7 @@ module ApplicationSettingsHelper :user_oauth_applications, :version_check_enabled, :allow_local_requests_from_hooks_and_services, + :hide_third_party_offers, :enforce_terms, :terms, :mirror_available diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index c24d340d184..8fd0b6f14c6 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -4,6 +4,7 @@ module ClustersHelper end def render_gcp_signup_offer + return if Gitlab::CurrentSettings.current_application_settings.hide_third_party_offers? return unless show_gcp_signup_offer? content_tag :section, class: 'no-animate expanded' do |