Commit 98fd60f5 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Satisfy rubocop

parent 1d778228
......@@ -11,7 +11,7 @@ module IssuableAction
issuable.destroy
route = polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable.class])
issuable_name = issuable.class.name.underscore.gsub('_', ' ')
issuable_name = issuable.class.name.underscore.tr('_', ' ')
respond_to do |format|
format.html { redirect_to route, notice: "This #{issuable_name} was deleted." }
......
......@@ -165,7 +165,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
<<<<<<< 67043ec53b4c35d5a9862fe78bd3f47e412919cd
def remove_wip
MergeRequests::UpdateService.new(project, current_user, title: @merge_request.wipless_title).execute(@merge_request)
......@@ -173,8 +172,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
notice: "The merge request can now be merged."
end
=======
>>>>>>> Dry destroy action on issuables
def merge_check
@merge_request.check_if_can_be_merged
......
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