Add latest changes from gitlab-org/gitlab@master

14 files changed, 54 insertions, 1 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index e0b0baeb4d5..26a7062581f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2606,6 +2606,10 @@ class Project < ApplicationRecord
     ProjectStatistics.increment_statistic(self, statistic, delta)
   end
 
+  def merge_requests_author_approval
+    !!read_attribute(:merge_requests_author_approval)
+  end
+
   private
 
   def set_container_registry_access_level
diff --git a/config/feature_flags/development/datadog_ci_integration.yml b/config/feature_flags/development/datadog_ci_integration.yml
index c53ef36f3c1..4f8fca4950a 100644
--- a/config/feature_flags/development/datadog_ci_integration.yml
+++ b/config/feature_flags/development/datadog_ci_integration.yml
@@ -5,3 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284088
 type: development
 group: group::ecosystem
 default_enabled: false
+milestone: '13.7'
diff --git a/config/feature_flags/development/graphql_pipeline_details.yml b/config/feature_flags/development/graphql_pipeline_details.yml
index 55cf5caa332..57b32c55da3 100644
--- a/config/feature_flags/development/graphql_pipeline_details.yml
+++ b/config/feature_flags/development/graphql_pipeline_details.yml
@@ -5,3 +5,4 @@ rollout_issue_url:
 type: development
 group: group::pipeline authoring
 default_enabled: true
+milestone: '13.6'
diff --git a/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml b/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml
index 3f2381e9ff6..a75824d3c24 100644
--- a/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml
+++ b/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml
@@ -5,3 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/225322
 type: development
 group: group::code review
 default_enabled: false
+milestone: '13.6'
diff --git a/config/feature_flags/development/push_rules_supersede_code_owners.yml b/config/feature_flags/development/push_rules_supersede_code_owners.yml
index 504cd7ec38e..2341556502f 100644
--- a/config/feature_flags/development/push_rules_supersede_code_owners.yml
+++ b/config/feature_flags/development/push_rules_supersede_code_owners.yml
@@ -5,3 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/262019
 type: development
 group: group::code review
 default_enabled: true
+milestone: '13.5'
diff --git a/config/feature_flags/development/runner_graphql_query.yml b/config/feature_flags/development/runner_graphql_query.yml
index 1ad90d362d0..356c465fbbc 100644
--- a/config/feature_flags/development/runner_graphql_query.yml
+++ b/config/feature_flags/development/runner_graphql_query.yml
@@ -6,3 +6,4 @@ milestone:
 type: development
 group: group::runner
 default_enabled: false
+milestone: '13.12'
diff --git a/config/feature_flags/development/sync_traversal_ids.yml b/config/feature_flags/development/sync_traversal_ids.yml
index bd612f9646c..188bb3e0975 100644
--- a/config/feature_flags/development/sync_traversal_ids.yml
+++ b/config/feature_flags/development/sync_traversal_ids.yml
@@ -5,3 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321947
 group: group::access
 type: development
 default_enabled: true
+milestone: '13.11'
diff --git a/config/feature_flags/development/unified_diff_components.yml b/config/feature_flags/development/unified_diff_components.yml
index 0176d8c55ba..262458820f7 100644
--- a/config/feature_flags/development/unified_diff_components.yml
+++ b/config/feature_flags/development/unified_diff_components.yml
@@ -5,3 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268039
 type: development
 group: group::code review
 default_enabled: true
+milestone: '13.6'
diff --git a/config/feature_flags/development/wiki_content_editor.yml b/config/feature_flags/development/wiki_content_editor.yml
index f4d86f01465..92a464a14e5 100644
--- a/config/feature_flags/development/wiki_content_editor.yml
+++ b/config/feature_flags/development/wiki_content_editor.yml
@@ -5,3 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255919
 group: group::editor
 type: development
 default_enabled: false
+milestone: '13.12'
diff --git a/db/migrate/20210517221612_add_default_value_to_merge_requests_author_approval_on_projects.rb b/db/migrate/20210517221612_add_default_value_to_merge_requests_author_approval_on_projects.rb
new file mode 100644
index 00000000000..1c017a366c8
--- /dev/null
+++ b/db/migrate/20210517221612_add_default_value_to_merge_requests_author_approval_on_projects.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddDefaultValueToMergeRequestsAuthorApprovalOnProjects < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    with_lock_retries do
+      change_column_default :projects, :merge_requests_author_approval, false
+    end
+  end
+
+  def down
+    with_lock_retries do
+      change_column_default :projects, :merge_requests_author_approval, nil
+    end
+  end
+end
diff --git a/db/schema_migrations/20210517221612 b/db/schema_migrations/20210517221612
new file mode 100644
index 00000000000..4078e0b44f0
--- /dev/null
+++ b/db/schema_migrations/20210517221612
@@ -0,0 +1 @@
+69e7297ace1301bbdb63053bd30b75c326122873fbc6c5c15f9f118166111434
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index d550c0f7eaa..2c90220efc0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -16997,7 +16997,7 @@ CREATE TABLE projects (
     pages_https_only boolean DEFAULT true,
     external_webhook_token character varying,
     packages_enabled boolean,
-    merge_requests_author_approval boolean,
+    merge_requests_author_approval boolean DEFAULT false,
     pool_repository_id bigint,
     runners_token_encrypted character varying,
     bfg_object_map character varying,
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 97ddf2da490..bb4096c010c 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -31662,6 +31662,9 @@ msgstr ""
 msgid "SuperSonics|Sync subscription details"
 msgstr ""
 
+msgid "SuperSonics|The activation code is not valid. Please make sure to copy it exactly from the Customers Portal or confirmation email. Learn more about %{linkStart}activating your subscription%{linkEnd}."
+msgstr ""
+
 msgid "SuperSonics|The subscription details synced successfully."
 msgstr ""
 
@@ -31698,6 +31701,9 @@ msgstr ""
 msgid "SuperSonics|Valid From"
 msgstr ""
 
+msgid "SuperSonics|You can learn more about %{activationLinkStart}activating your subscription%{activationLinkEnd}. If you need further assistance, please %{supportLinkStart}contact GitLab Support%{supportLinkEnd}."
+msgstr ""
+
 msgid "SuperSonics|You can no longer sync your subscription details with GitLab. Get help for the most common connectivity issues by %{connectivityHelpLinkStart}troubleshooting the activation code%{connectivityHelpLinkEnd}."
 msgstr ""
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 4c7d570d72c..1bd822ee0e3 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -472,6 +472,23 @@ RSpec.describe Project, factory_default: :keep do
     end
   end
 
+  describe '#merge_requests_author_approval' do
+    where(:attribute_value, :return_value) do
+      true  | true
+      false | false
+      nil   | false
+    end
+
+    with_them do
+      let(:project) { create(:project, merge_requests_author_approval: attribute_value) }
+
+      it 'returns expected value' do
+        expect(project.merge_requests_author_approval).to eq(return_value)
+        expect(project.merge_requests_author_approval?).to eq(return_value)
+      end
+    end
+  end
+
   describe '#all_pipelines' do
     let_it_be(:project) { create(:project) }