From b8deafd0d8eacb5cbba9e868c445c92b514d537e Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 1 Jul 2017 15:23:43 +0100 Subject: Removed merge_request/issue state_event param parent and removed issuable_path helpers in favour of issuable_url helpers --- app/controllers/projects/issues_controller.rb | 2 +- app/controllers/projects/merge_requests/application_controller.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'app/controllers/projects') 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 -- cgit v1.2.3