kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Backport changes to Projects::MergeRequestsController for gitlab-org/gitlab-ee!2200

See merge request !12358
This commit is contained in:
Douwe Maan 2017-06-22 15:30:24 +00:00
commit d97118e6f8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/projects/merge_requests_controller.rb
View file

@ -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