kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Satisfy rubocop

Browse source
This commit is contained in:
Zeger-Jan van de Weg 2016-03-19 20:30:45 +01:00
parent 1d77822816
commit 98fd60f50b
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/concerns/issuable_action.rb
View file

@ -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." }

3
app/controllers/projects/merge_requests_controller.rb
View file

@ -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