diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 10:26:19 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 10:26:19 +0200 |
| commit | 84727fba96c6794874e1f94d581408b70e1842a7 (patch) | |
| tree | eeaf4adf7574d0817f3413d5f36bd894a01fdf11 /app/models | |
| parent | f293d991a4bd55df10ff8dc9201b6b45377a6681 (diff) | |
| download | gitlab-ce-84727fba96c6794874e1f94d581408b70e1842a7.tar.gz | |
Revert "Merge branch 'improve-merge-requests' into 'master'
"
This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing
changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 2 | ||||
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 467b90861f9..631a2d887cc 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -432,7 +432,7 @@ class MergeRequest < ActiveRecord::Base target_project.repository.fetch_ref( source_project.repository.path_to_repo, "refs/heads/#{source_branch}", - "refs/merge-requests/#{iid}/head" + "refs/merge-requests/#{id}/head" ) end diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index e317c8eac4d..2177f972ca3 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -161,8 +161,8 @@ class MergeRequestDiff < ActiveRecord::Base def compare_result @compare_result ||= begin - # Update ref for merge request - merge_request.fetch_ref + # Update ref if merge request is from fork + merge_request.fetch_ref if merge_request.for_fork? # Get latest sha of branch from source project source_sha = merge_request.source_project.commit(source_branch).sha |