diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-03 20:25:37 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-07 16:57:28 +0300 |
| commit | c53f2d8ebc64ef59f67265ae7c6b96a3c127cea7 (patch) | |
| tree | 3a9291d8c45dcff64e5e6efc648071e17433ba50 /app/controllers/projects | |
| parent | 55dd0d722d87a24f3b83a8a7692666a64387d668 (diff) | |
Revert parent param removal
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests/application_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 9a3216cbd05..c9e636fb65e 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -271,7 +271,7 @@ class Projects::IssuesController < Projects::ApplicationController end def issue_params - params.permit(*issue_params_attributes) + params.require(:issue).permit(*issue_params_attributes) end def issue_params_attributes diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index b5335509b11..6602b204fcb 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -17,7 +17,7 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont end def merge_request_params - params.permit(merge_request_params_attributes) + params.require(:merge_request).permit(merge_request_params_attributes) end def merge_request_params_attributes |