Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
050c8dc7
Commit
050c8dc7
authored
Nov 03, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController
parent
e4c05de7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
6 deletions
+21
-6
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+21
-6
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
050c8dc7
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment