diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-15 16:20:18 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:14:54 -0500 |
| commit | 169070ba4b83b1cbb4084abcf8ffeb9f492fcffa (patch) | |
| tree | d8491d0a1058b8f2b2d66ee81388417566560e29 /app/models/commit.rb | |
| parent | 6908663479b267cd82402439a3e5059a1477b4d9 (diff) | |
| download | gitlab-ce-169070ba4b83b1cbb4084abcf8ffeb9f492fcffa.tar.gz | |
Some updates from last code review.
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 628926e4886..e8528782b59 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -228,7 +228,7 @@ class Commit end def revert_message - "Revert \"#{title}\"" + "\n\n#{revert_description}" + %Q{Revert "#{title}"\n\n#{revert_description}} end def reverts_commit?(commit) @@ -242,7 +242,7 @@ class Commit def merged_merge_request return @merged_merge_request if defined?(@merged_merge_request) - @merged_merge_request = merge_commit? && MergeRequest.find_by(merge_commit_sha: id) + @merged_merge_request = merge_commit? && project.merge_requests.find_by(merge_commit_sha: id) end def has_been_reverted?(current_user = nil, noteable = self) |