Satisfy rubocop
This commit is contained in:
parent
1d77822816
commit
98fd60f50b
2 changed files with 1 additions and 4 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue