diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-08 12:22:09 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-08 12:22:09 +0300 |
| commit | 4537623d12fb7372262267be5d6ec3b41f3f476c (patch) | |
| tree | ccd0494b1112c388114e032f994505a2344123be /app/models/merge_request.rb | |
| parent | c7e490ebd5ab69fe043cd39145bd6ef3850a6921 (diff) | |
| parent | 1a83fea711961844adc7ddb21ce007143fefc144 (diff) | |
| download | gitlab-ce-4537623d12fb7372262267be5d6ec3b41f3f476c.tar.gz | |
Merge branch 'master' into karlhungus-mr-on-fork
Conflicts:
app/contexts/filter_context.rb
app/contexts/search_context.rb
app/models/merge_request.rb
app/models/note.rb
app/views/shared/_merge_requests.html.haml
spec/controllers/commit_controller_spec.rb
spec/services/notification_service_spec.rb
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 703032649b9..b3c7aa39cf8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -149,11 +149,12 @@ class MergeRequest < ActiveRecord::Base end def unmerged_diffs - if for_fork? - diffs = Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite - else - diffs = target_project.repository.diffs_between(source_branch, target_branch) - end + diffs = if for_fork? + Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite + else + Gitlab::Git::Diff.between(project.repository, source_branch, target_branch) + end + diffs ||= [] diffs end |