Revert "Merge branch '43263-git-push-option-to-create-mr' into 'master'"revert-26752-for-broken-master

This reverts commit d95889b8a41037aa68250137b09b22b092776dfe, reversing
changes made to 41adfde8ffa34eb45bd1d6f15ad6e80c8ef0f8a9.

1 files changed, 8 insertions, 16 deletions

diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 00f0bbab231..9c7b9146c8f 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -256,27 +256,19 @@ module API
       post '/post_receive' do
         status 200
 
-        output = {} # Messages to gitlab-shell
-        user = identify(params[:identifier])
-        project = Gitlab::GlRepository.parse(params[:gl_repository]).first
-        push_options = Gitlab::PushOptions.new(params[:push_options])
-
         PostReceive.perform_async(params[:gl_repository], params[:identifier],
-          params[:changes], push_options.as_json)
-
-        if Feature.enabled?(:mr_push_options, default_enabled: true)
-          mr_options = push_options.get(:merge_request)
-          output.merge!(process_mr_push_options(mr_options, project, user, params[:changes])) if mr_options.present?
-        end
-
+          params[:changes], params[:push_options].to_a)
         broadcast_message = BroadcastMessage.current&.last&.message
         reference_counter_decreased = Gitlab::ReferenceCounter.new(params[:gl_repository]).decrease
 
-        output.merge!(
+        output = {
+          merge_request_urls: merge_request_urls,
           broadcast_message: broadcast_message,
-          reference_counter_decreased: reference_counter_decreased,
-          merge_request_urls: merge_request_urls
-        )
+          reference_counter_decreased: reference_counter_decreased
+        }
+
+        project = Gitlab::GlRepository.parse(params[:gl_repository]).first
+        user = identify(params[:identifier])
 
         # A user is not guaranteed to be returned; an orphaned write deploy
         # key could be used