diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-05 18:49:45 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:14:51 -0500 |
| commit | 91e6e32d130308496065d2efbf71d61e0eeff784 (patch) | |
| tree | 460d9980867c6739490dcfdb153f1940c61241f4 /app/models/commit.rb | |
| parent | b36319a17cf82ee9782a572fab741938662a1c6b (diff) | |
| download | gitlab-ce-91e6e32d130308496065d2efbf71d61e0eeff784.tar.gz | |
Make it work for merge commits.
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index e05bddc24c6..05468451e1f 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -223,6 +223,10 @@ class Commit "Revert \"#{safe_message.lines.first}\"".truncate(80) + "\n\nReverts #{to_reference}" end + def is_a_merge_commit? + parents.size > 1 + end + private def repo_changes |