Automatic merge of gitlab-org/gitlab-ce master

doc/user/project/merge_requests/index.md

@@ -398,6 +398,8 @@ You can also use this push option in addition to the
 
 ### Add or remove labels using git push options
 
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31831) in GitLab 12.3.
+
 You can add or remove labels from merge requests using push options.
 
 For example, to add two labels to an existing merge request, use the

spec/controllers/registrations_controller_spec.rb

@@ -83,6 +83,13 @@ describe RegistrationsController do
         stub_application_setting(recaptcha_enabled: true)
       end
 
+      after do
+        # Avoid test ordering issue and ensure `verify_recaptcha` returns true
+        unless Recaptcha.configuration.skip_verify_env.include?('test')
+          Recaptcha.configuration.skip_verify_env << 'test'
+        end
+      end
+
       it 'displays an error when the reCAPTCHA is not solved' do
         fail_recaptcha
 
@@ -93,11 +100,6 @@ describe RegistrationsController do
       end
 
       it 'redirects to the dashboard when the recaptcha is solved' do
-        # Avoid test ordering issue and ensure `verify_recaptcha` returns true
-        unless Recaptcha.configuration.skip_verify_env.include?('test')
-          Recaptcha.configuration.skip_verify_env << 'test'
-        end
-
         post(:create, params: user_params)
 
         expect(flash[:notice]).to include 'Welcome! You have signed up successfully.'