Commit fc8b0748 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix/ce-14503-master' into 'master'

Ensure Projects::ApproversController inherits from Projects::ApplicationController

Backport of !296.

See merge request !303
parents 01d6f535 1ec9ef59
class Projects::ApproversController < ApplicationController class Projects::ApproversController < Projects::ApplicationController
def destroy def destroy
if params[:merge_request_id] if params[:merge_request_id]
authorize_create_merge_request! authorize_create_merge_request!
...@@ -8,7 +8,7 @@ class Projects::ApproversController < ApplicationController ...@@ -8,7 +8,7 @@ class Projects::ApproversController < ApplicationController
authorize_admin_project! authorize_admin_project!
project.approvers.find(params[:id]).destroy project.approvers.find(params[:id]).destroy
end end
redirect_back_or_default(default: { action: 'index' }) redirect_back_or_default(default: { action: 'index' })
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment