diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-08 15:37:27 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:14:52 -0500 |
| commit | a28eef1d1a871c14142d01f1ef8c76660da34c21 (patch) | |
| tree | dbf503b472f2ecb09ad0d7d0af69ea166604344d /app/models/commit.rb | |
| parent | 38752d159d4f7c06d374666f95fd52864449d838 (diff) | |
| download | gitlab-ce-a28eef1d1a871c14142d01f1ef8c76660da34c21.tar.gz | |
Update copy and URLs used when reverting MRs.
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 398041be3fd..25007c7f15a 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -227,6 +227,12 @@ class Commit parents.size > 1 end + def merged_merge_request + return @merged_merge_request if defined?(@merged_merge_request) + + @merged_merge_request = is_a_merge_commit? && MergeRequest.where(merge_commit_sha: id).first + end + private def repo_changes |