From c53f2d8ebc64ef59f67265ae7c6b96a3c127cea7 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Mon, 3 Jul 2017 18:25:37 +0100 Subject: Revert parent param removal --- app/controllers/projects/issues_controller.rb | 2 +- app/controllers/projects/merge_requests/application_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/projects') 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 -- cgit v1.2.3