Commit 050c8dc7 authored by Robert Speicher's avatar Robert Speicher

Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController

parent e4c05de7
...@@ -589,12 +589,27 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -589,12 +589,27 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end end
def merge_request_params def merge_request_params
params.require(:merge_request).permit( params.require(:merge_request)
:title, :assignee_id, :source_project_id, :source_branch, .permit(merge_request_params_ce)
:target_project_id, :target_branch, :milestone_id, end
:state_event, :description, :task_num, :force_remove_source_branch,
:lock_version, label_ids: [] 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 end
def merge_params def merge_params
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment