From 8893ac4ba407fdbacd85fa1b94d393b150ba5874 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 11 Jun 2015 18:35:43 +0200 Subject: Fix rubocop Signed-off-by: Dmitriy Zaporozhets --- app/controllers/projects/merge_requests_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.1