summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFrancisco Javier López <fjlopez@gitlab.com>2019-04-01 15:13:22 +0000
committerNick Thomas <nick@gitlab.com>2019-04-01 15:13:22 +0000
commit45293f66facc2792f15bd06bb5b05d55fc155cba (patch)
tree62c61b7d0db4e23c6d21c2c18a9585f73a4df993 /app
parent0a480e3c32c4fd783b6a6271dad7c423e0d8bdd1 (diff)
downloadgitlab-ce-45293f66facc2792f15bd06bb5b05d55fc155cba.tar.gz
Fix MergeRequest#has_commits? nil comparison
Diffstat (limited to 'app')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b52c480a487..d3951cd72db 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1343,7 +1343,7 @@ class MergeRequest < ApplicationRecord
end
def has_commits?
- merge_request_diff && commits_count > 0
+ merge_request_diff && commits_count.to_i > 0
end
def has_no_commits?