Automatic merge of gitlab-org/gitlab-ce master

PROCESS.md

@@ -94,21 +94,12 @@ The plan for the upcoming milestone must be finalized by the 1st of the month, o
 
 ## Feature freeze on the 7th for the release on the 22nd
 
-After 7th at 23:59 (Pacific Time Zone) of each month, stable branch and RC1 
-of the upcoming release (to be shipped on the 22nd) is created and deployed to GitLab.com. 
-The stable branch is frozen at the most recent "qualifying commit" on master.
-A "qualifying commit" is one that is pushed before the feature freeze cutoff time
-and that passes all CI jobs (green pipeline).
+The feature freeze on the 7th has been discontinued. [Transition period overview]
+describes the change to this process. During the transition period, the only guarantee that
+a change will be included in the release on the 22nd is if the change has been
+deployed to GitLab.com prior to this date.
 
-Merge requests may still be merged into master during this
-period, but they will go into the _next_ release, unless they are manually
-cherry-picked into the stable branch.
-
-By freezing the stable branches 2 weeks prior to a release, we reduce the risk
-of a last minute merge request potentially breaking things.
-
-Any release candidate that gets created after this date can become a final
-release, hence the name release candidate.
+[Transition period]: https://gitlab.com/gitlab-org/release/docs/blob/21cbd409dd5f157fe252f254f3e897f01908abe2/general/deploy/auto-deploy-transition.md#transition
 
 ### Feature flags
 

spec/services/auto_merge_service_spec.rb

@@ -10,8 +10,8 @@ describe AutoMergeService do
   describe '.all_strategies' do
     subject { described_class.all_strategies }
 
-    it 'returns all strategies' do
-      is_expected.to eq(AutoMergeService::STRATEGIES)
+    it 'includes merge when pipeline succeeds' do
+      is_expected.to include(AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS)
     end
   end