diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-22 18:30:24 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-22 18:30:24 +0300 |
| commit | d97118e6f8e59be95e882da5be7ff3e6036c6812 (patch) | |
| tree | 8fda1a616af130f1aaf47a09cc2f4723cea047da | |
| parent | 9b2e890c378f84e2cb73aae838fc2c79a3717c0d (diff) | |
| parent | 1e743a1db7978eeb22f6b5dc94c3268b31cfec76 (diff) | |
Merge branch 'backport-projects-mr-controller-changes' into 'master'
Backport changes to Projects::MergeRequestsController for gitlab-org/gitlab-ee!2200
See merge request !12358
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 164a8824277..879ff6d393e 100644 --- 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 |