From 5ef3f80d41198bff244f6a6d2e3146b4741e81c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Thu, 18 Feb 2016 11:58:04 -0500 Subject: More updates from the last code review. --- app/models/commit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/commit.rb') diff --git a/app/models/commit.rb b/app/models/commit.rb index bb997663cf4..b99abb540ea 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -242,7 +242,7 @@ class Commit def merged_merge_request return @merged_merge_request if defined?(@merged_merge_request) - @merged_merge_request = merge_commit? && project.merge_requests.find_by(merge_commit_sha: id) + @merged_merge_request = project.merge_requests.find_by(merge_commit_sha: id) if merge_commit? end def has_been_reverted?(current_user = nil, noteable = self) -- cgit v1.2.1