Merge branch 'ee-48578-disable-gcp-free-credit-banner-at-instance-level' into 'master'

port 48578-disable-gcp-free-credit-banner-at-instance-level to EE

Closes gitlab-ce#48578

See merge request gitlab-org/gitlab-ee!6395

app/helpers/application_settings_helper.rb

@@ -252,6 +252,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

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

app/models/application_setting.rb

@@ -295,6 +295,7 @@ class ApplicationSetting < ActiveRecord::Base
       gitaly_timeout_medium: 30,
       gitaly_timeout_default: 55,
       allow_local_requests_from_hooks_and_services: false,
+      hide_third_party_offers: false,
       mirror_available: true
     }
   end

app/views/admin/application_settings/_third_party_offers.html.haml

+- application_setting = local_assigns.fetch(:application_setting)
+
+= form_for application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
+  = form_errors(application_setting)
+
+  %fieldset
+    .form-group
+      .form-check
+        = f.check_box :hide_third_party_offers, class: 'form-check-input'
+        = f.label :hide_third_party_offers, class: 'form-check-label' do
+          Do not display offers from third parties within GitLab
+
+  = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/show.html.haml

@@ -374,4 +374,15 @@
     .settings-content
       = render partial: 'slack'
 
+%section.settings.as-third-party-offers.no-animate#js-third-party-offers-settings{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      = _('Third party offers')
+    %button.btn.btn-default.js-settings-toggle{ type: 'button' }
+      = expanded ? _('Collapse') : _('Expand')
+    %p
+      = _('Control the display of third party offers.')
+  .settings-content
+    = render 'third_party_offers', application_setting: @application_setting
+
 = render_if_exists 'admin/application_settings/pseudonymizer_settings', expanded: expanded

changelogs/unreleased/48578-disable-gcp-free-credit-banner-at-instance-level.yml

+---
+title: Add option to hide third party offers in admin application settings
+merge_request: 20379
+author:
+type: added

db/migrate/20180704204006_add_hide_third_party_offers_to_application_settings.rb

+class AddHideThirdPartyOffersToApplicationSettings < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:application_settings, :hide_third_party_offers,
+                            :boolean,
+                            default: false,
+                            allow_null: false)
+  end
+
+  def down
+    remove_column(:application_settings, :hide_third_party_offers)
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180702181530) do
+ActiveRecord::Schema.define(version: 20180704204006) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -207,6 +207,7 @@ ActiveRecord::Schema.define(version: 20180702181530) do
     t.string "email_additional_text"
     t.boolean "enforce_terms", default: false
     t.boolean "pseudonymizer_enabled", default: false, null: false
+    t.boolean "hide_third_party_offers", default: false, null: false
   end
 
   create_table "approvals", force: :cascade do |t|

doc/administration/index.md

@@ -54,6 +54,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 - [Elasticsearch](../integration/elasticsearch.md): Enable Elasticsearch to empower GitLab's Advanced Global Search. Useful when you deal with a huge amount of data. **[STARTER ONLY]**
 - [External Classification Policy Authorization](../user/admin_area/settings/external_authorization.md) **[PREMIUM ONLY]**
 - [Enforcing Terms of Service](../user/admin_area/settings/terms.md)
+- [Third party offers](../user/admin_area/settings/third_party_offers.md)
 
 #### Customizing GitLab's appearance
 

doc/user/admin_area/settings/third_party_offers.md

+# Third party offers
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20379)
+> in [GitLab Core](https://about.gitlab.com/pricing/) 11.1
+
+The display of third party offers can be controlled in the Admin Area -> Settings page.

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 20:54+0200\n"
-"PO-Revision-Date: 2018-07-09 20:54+0200\n"
+"POT-Creation-Date: 2018-07-10 08:56+0200\n"
+"PO-Revision-Date: 2018-07-10 08:56+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -1918,6 +1918,9 @@ msgstr ""
 msgid "ContributorsPage|Please wait a moment, this page will automatically refresh when ready."
 msgstr ""
 
+msgid "Control the display of third party offers."
+msgstr ""
+
 msgid "Control the maximum concurrency of LFS/attachment backfill for this secondary node"
 msgstr ""
 
@@ -5704,6 +5707,9 @@ msgstr ""
 msgid "They can be managed using the %{link}."
 msgstr ""
 
+msgid "Third party offers"
+msgstr ""
+
 msgid "This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area."
 msgstr ""
 

spec/features/admin/admin_settings_spec.rb

@@ -297,6 +297,16 @@ describe 'Admin updates settings' do
     expect(Gitlab::CurrentSettings.allow_local_requests_from_hooks_and_services).to be true
   end
 
+  it 'Enable hiding third party offers' do
+    page.within('.as-third-party-offers') do
+      check 'Do not display offers from third parties within GitLab'
+      click_button 'Save changes'
+    end
+
+    expect(page).to have_content "Application settings saved successfully"
+    expect(Gitlab::CurrentSettings.hide_third_party_offers).to be true
+  end
+
   it 'Change Slack Notifications Service template settings' do
     first(:link, 'Service Templates').click
     click_link 'Slack notifications'