diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-22 18:13:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-22 18:13:46 +0000 |
| commit | 493d166d66902e645f3b0afb76526317fd98ceeb (patch) | |
| tree | fbc252f0c6e8c79235058de5249db037b753730c /app | |
| parent | 7479f0602e85c5355b9ba09786e6e0ed09d21551 (diff) | |
| parent | 96ed5c5114e7863d4d0731ccea9da99696a867a4 (diff) | |
| download | gitlab-ce-493d166d66902e645f3b0afb76526317fd98ceeb.tar.gz | |
Merge branch 'fix/13631-error-with-merged-mr' into 'master'
Ensure we don't check a commit's description for revert message if it has no description
Fixes #13631.
/cc @razer6 @grzesiek @yorickpeterse @rdavila
See merge request !2917
Diffstat (limited to 'app')
| -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 b99abb540ea..3224f5457f0 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -232,7 +232,7 @@ class Commit end def reverts_commit?(commit) - description.include?(commit.revert_description) + description? && description.include?(commit.revert_description) end def merge_commit? |