summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-05 16:51:04 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-05 16:51:04 +0300
commitb92655663c9f066de6a67217ad9a55f38e20cffd (patch)
tree90d1d1959c5f4ae086dddef66bff3118a6d9b239 /app/models/merge_request.rb
parentd602d5b1b05036788c67c13510c34725c68116ea (diff)
downloadgitlab-ce-b92655663c9f066de6a67217ad9a55f38e20cffd.tar.gz
Update main calls to gitlab_git
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 2a476355404..9cd883f421b 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -137,7 +137,7 @@ class MergeRequest < ActiveRecord::Base
end
def unmerged_diffs
- project.repository.diffs_between(source_branch, target_branch)
+ Gitlab::Git::Diff.between(project.repository, source_branch, target_branch)
end
def last_commit