summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-31 18:49:58 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-31 18:49:58 +0300
commit154e54b46e01615bc13f5e3ac2d0f07f7a27464d (patch)
treed6e98c1bb3ce7a79ee074a6d807c78b6f6e1544e /app/models/merge_request.rb
parentd444a23ad6d9c2455a0159435d0c63342aca5edb (diff)
downloadgitlab-ce-154e54b46e01615bc13f5e3ac2d0f07f7a27464d.tar.gz
Remove grit logic from app/
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 9d42b1e1f32..505f6637d77 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -169,7 +169,7 @@ class MergeRequest < ActiveRecord::Base
end
def unmerged_commits
- self.project.repo.
+ self.project.repository.
commits_between(self.target_branch, self.source_branch).
map {|c| Commit.new(c)}.
sort_by(&:created_at).