diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-11 18:35:43 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-11 18:35:43 +0200 |
| commit | 8893ac4ba407fdbacd85fa1b94d393b150ba5874 (patch) | |
| tree | 7ac97b380fdc10331864855891715befce1df297 | |
| parent | 00600a592b006024ff102499fc3c9412f26e993e (diff) | |
| download | gitlab-ce-8893ac4ba407fdbacd85fa1b94d393b150ba5874.tar.gz | |
Fix rubocop
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 277a2ade2e3..3bb16f1b9fd 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -142,8 +142,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @allowed_to_merge = allowed_to_merge? closes_issues - render partial: "projects/merge_requests/widget/show.html.haml", - layout: false + render partial: "projects/merge_requests/widget/show.html.haml", layout: false end def automerge |