summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-02-22 15:46:39 +0100
committerRémy Coutable <remy@rymai.me>2016-02-22 18:33:02 +0100
commit96ed5c5114e7863d4d0731ccea9da99696a867a4 (patch)
treec81ac1ed703affc3ef13ffcb55e278612471b624 /app
parent96ce80d5789e396c0071b48a79bd3f98a1d66ea4 (diff)
downloadgitlab-ce-96ed5c5114e7863d4d0731ccea9da99696a867a4.tar.gz
Ensure we don't check a commit's description for revert message if it has no description
Diffstat (limited to 'app')
-rw-r--r--app/models/commit.rb2
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?