summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-02 22:37:20 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-02 22:37:20 +0300
commit03f41e2820d76d272aa7357cf726b5d131bb80e0 (patch)
tree8f9b317572899049d43de0d72194b9b50da1648e /app/models/merge_request.rb
parent0c5795a49726402d2f2751d8b05d5bbb9dd23511 (diff)
downloadgitlab-ce-03f41e2820d76d272aa7357cf726b5d131bb80e0.tar.gz
Gitlab::Git::Tree & Blob added
Diffstat (limited to 'app/models/merge_request.rb')
-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 0bab88313c1..105d9239cf6 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -152,7 +152,7 @@ class MergeRequest < ActiveRecord::Base
end
def commits
- load_commits(st_commits) || []
+ load_commits(st_commits || [])
end
def probably_merged?