Merge branch '210045-make-ci-ci-variables-protected-by-default' into 'master'

Make protected_ci_variables setting enabled by default

See merge request gitlab-org/gitlab!31715

app/models/application_setting_implementation.rb

@@ -96,7 +96,7 @@ module ApplicationSettingImplementation
         plantuml_url: nil,
         polling_interval_multiplier: 1,
         project_export_enabled: true,
-        protected_ci_variables: false,
+        protected_ci_variables: true,
         push_event_hooks_limit: 3,
         push_event_activities_limit: 3,
         raw_blob_request_limit: 300,

changelogs/unreleased/210045-make-ci-ci-variables-protected-by-default.yml

+---
+title: Make protected_ci_variables setting enabled by default
+merge_request: 31715
+author:
+type: changed

db/migrate/20200512085150_change_default_value_of_protected_ci_variables_of_application_settings_to_true.rb

+# frozen_string_literal: true
+
+class ChangeDefaultValueOfProtectedCiVariablesOfApplicationSettingsToTrue < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    change_column_default :application_settings, :protected_ci_variables, from: false, to: true
+  end
+end

db/structure.sql

@@ -349,7 +349,7 @@ CREATE TABLE public.application_settings (
     diff_max_patch_bytes integer DEFAULT 102400 NOT NULL,
     archive_builds_in_seconds integer,
     commit_email_hostname character varying,
-    protected_ci_variables boolean DEFAULT false NOT NULL,
+    protected_ci_variables boolean DEFAULT true NOT NULL,
     runners_registration_token_encrypted character varying,
     local_markdown_version integer DEFAULT 0 NOT NULL,
     first_day_of_week integer DEFAULT 0 NOT NULL,
@@ -13768,5 +13768,6 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200508091106
 20200511092714
 20200511145545
+20200512085150
 \.
 

spec/support/shared_examples/features/variable_list_shared_examples.rb

@@ -29,7 +29,6 @@ RSpec.shared_examples 'variable list' do
     page.within('.js-ci-variable-list-section .js-row:last-child') do
       find('.js-ci-variable-input-key').set('key')
       find('.js-ci-variable-input-value').set('key_value')
-      find('.ci-variable-protected-item .js-project-feature-toggle').click
 
       expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('true')
     end
@@ -173,6 +172,7 @@ RSpec.shared_examples 'variable list' do
     page.within('.js-ci-variable-list-section .js-row:last-child') do
       find('.js-ci-variable-input-key').set('unprotected_key')
       find('.js-ci-variable-input-value').set('unprotected_value')
+      find('.ci-variable-protected-item .js-project-feature-toggle').click
 
       expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('false')
     end
@@ -207,7 +207,6 @@ RSpec.shared_examples 'variable list' do
     page.within('.js-ci-variable-list-section .js-row:last-child') do
       find('.js-ci-variable-input-key').set('protected_key')
       find('.js-ci-variable-input-value').set('protected_value')
-      find('.ci-variable-protected-item .js-project-feature-toggle').click
 
       expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('true')
     end