diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-19 20:30:45 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-19 22:05:45 +0100 |
| commit | 98fd60f50b6658d21503f548649c8db291050ab7 (patch) | |
| tree | fa615eddeea0695d2143ecc63e4cd854b2f6ca5d | |
| parent | 1d7782281693a94b2d8efcdd9d05f81fefae75f9 (diff) | |
| download | gitlab-ce-98fd60f50b6658d21503f548649c8db291050ab7.tar.gz | |
Satisfy rubocop
| -rw-r--r-- | app/controllers/concerns/issuable_action.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/concerns/issuable_action.rb b/app/controllers/concerns/issuable_action.rb index 3750a268d7a..d82f2bf9ef6 100644 --- a/app/controllers/concerns/issuable_action.rb +++ b/app/controllers/concerns/issuable_action.rb @@ -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." } diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index ff4c9b02cea..9cc0c8f64e3 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -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 |