Skip to content

G
gitlab-ce
Commit 8893ac4b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Fix rubocop 

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 00600a59
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
app/controllers/projects/merge_requests_controller.rb
View file @ 8893ac4b
...@@ -142,8 +142,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -142,8 +142,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@allowed_to_merge = allowed_to_merge? @allowed_to_merge = allowed_to_merge?
closes_issues closes_issues
render partial: "projects/merge_requests/widget/show.html.haml", render partial: "projects/merge_requests/widget/show.html.haml", layout: false
layout: false
end end
def automerge def automerge
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7