Merge branch 'backport-projects-mr-controller-changes' into 'master'

Backport changes to Projects::MergeRequestsController for gitlab-org/gitlab-ee!2200 See merge request !12358

Merge branch 'backport-projects-mr-controller-changes' into 'master'
d97118e6 · Douwe Maan · 9b2e890c · 1e743a1d · d97118e6
Commit d97118e6 authored Jun 22, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

merge_requests_controller.rb app/controllers/projects/merge_requests_controller.rb +7 -3

No files found.
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -575,10 +575,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController

  def merge_request_params
    params.require(:merge_request)
-      .permit(merge_request_params_ce)
+      .permit(merge_request_params_attributes)
  end

-  def merge_request_params_ce
+  def merge_request_params_attributes
    [
      :assignee_id,
      :description,
@@ -598,7 +598,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
  end

  def merge_params
-    params.permit(:should_remove_source_branch, :commit_message)
+    params.permit(merge_params_attributes)
+  end
+
+  def merge_params_attributes
+    [:should_remove_source_branch, :commit_message]
  end

  # Make sure merge requests created before 8.0