Merge branch 'rs-merge_request_params' into 'master'
Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController See merge request !7263
This commit is contained in:
commit
920551b585
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue