diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-01 17:23:43 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-07 16:57:00 +0300 |
| commit | b8deafd0d8eacb5cbba9e868c445c92b514d537e (patch) | |
| tree | cc7196c794fa9f9e2ac530590908e5a52a2e2766 /app/controllers/projects | |
| parent | 001c904f28566b2fb3575b5a79871cedf94ea289 (diff) | |
Removed merge_request/issue state_event param parent and removed issuable_path helpers in favour of issuable_url helpers
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 | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index c9e636fb65e..9a3216cbd05 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.require(:issue).permit(*issue_params_attributes) + params.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 5de0f828010..b5335509b11 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -17,8 +17,7 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont end def merge_request_params - params.require(:merge_request) - .permit(merge_request_params_attributes) + params.permit(merge_request_params_attributes) end def merge_request_params_attributes |