Merge branch 'label-descr-push-opts' into 'master'

Support title and desc on merge w/ push option

See merge request gitlab-org/gitlab-ce!31068

1 files changed, 8 insertions, 9 deletions

diff --git a/app/services/merge_requests/push_options_handler_service.rb b/app/services/merge_requests/push_options_handler_service.rb
index 6d70b5106c7..b210004e6e1 100644
--- a/app/services/merge_requests/push_options_handler_service.rb
+++ b/app/services/merge_requests/push_options_handler_service.rb
@@ -118,7 +118,14 @@ module MergeRequests
     end
 
     def base_params
-      params = {}
+      params = {
+        title: push_options[:title],
+        description: push_options[:description],
+        target_branch: push_options[:target],
+        force_remove_source_branch: push_options[:remove_source_branch]
+      }
+
+      params.compact!
 
       if push_options.key?(:merge_when_pipeline_succeeds)
         params.merge!(
@@ -127,14 +134,6 @@ module MergeRequests
         )
       end
 
-      if push_options.key?(:remove_source_branch)
-        params[:force_remove_source_branch] = push_options[:remove_source_branch]
-      end
-
-      if push_options.key?(:target)
-        params[:target_branch] = push_options[:target]
-      end
-
       params
     end