diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-18 11:58:04 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:15:42 -0500 |
| commit | 5ef3f80d41198bff244f6a6d2e3146b4741e81c1 (patch) | |
| tree | 580a551b8814e6149cd8f1d55a8b61fd7dcb17a0 /app/models/commit.rb | |
| parent | 78d3444fa7db81e2e2f947e066a3bbe6514be9ef (diff) | |
| download | gitlab-ce-5ef3f80d41198bff244f6a6d2e3146b4741e81c1.tar.gz | |
More updates from the last code review.
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |