diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-11-03 13:43:16 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-11-03 13:43:16 +0000 |
commit | 50775fab15ea99edd52fb22ede92b01e1dab5abc (patch) | |
tree | 0dc7f9db726fc6a99997f70455b65074ce3fbdfa | |
parent | 2f3e71015096deb238bb4a1d58346dfc2f8a23d6 (diff) | |
download | gitlab-ce-rs-merge_request_params.tar.gz |
Apply `*_params_ce + *_params_ee` pattern to MergeRequestsControllerrs-merge_request_params
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 30f1cf4e5be..19afe9a3deb 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -589,12 +589,27 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def merge_request_params - params.require(:merge_request).permit( - :title, :assignee_id, :source_project_id, :source_branch, - :target_project_id, :target_branch, :milestone_id, - :state_event, :description, :task_num, :force_remove_source_branch, - :lock_version, label_ids: [] - ) + params.require(:merge_request) + .permit(merge_request_params_ce) + end + + def merge_request_params_ce + [ + :assignee_id, + :description, + :force_remove_source_branch, + :lock_version, + :milestone_id, + :source_branch, + :source_project_id, + :state_event, + :target_branch, + :target_project_id, + :task_num, + :title, + + label_ids: [] + ] end def merge_params |