diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 14:12:24 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 14:12:24 +0300 |
| commit | d19d094b935b6b1b773d369893d4f112e91b38a9 (patch) | |
| tree | 1ded12ce6bed836952d8f10a9e7cf30be6775838 /lib | |
| parent | 0d715bcd812ca6c99884e117f28a400669aa8e57 (diff) | |
| download | gitlab-ce-d19d094b935b6b1b773d369893d4f112e91b38a9.tar.gz | |
Remove ugly button and truncate too long project names. Remove unecessary newlines
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/satellite/merge_action.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb index 6f402e80a63..969bb999936 100644 --- a/lib/gitlab/satellite/merge_action.rb +++ b/lib/gitlab/satellite/merge_action.rb @@ -48,14 +48,14 @@ module Gitlab def diff_in_satellite in_locked_and_timed_satellite do |merge_repo| prepare_satellite!(merge_repo) - update_satellite_source_and_target!(merge_repo) + if merge_request.for_fork? diff = merge_repo.git.native(:diff, default_options, "origin/#{merge_request.target_branch}", "source/#{merge_request.source_branch}") else diff = merge_repo.git.native(:diff, default_options, "#{merge_request.target_branch}", "#{merge_request.source_branch}") - end + return diff end rescue Grit::Git::CommandFailed => ex @@ -88,11 +88,13 @@ module Gitlab in_locked_and_timed_satellite do |merge_repo| prepare_satellite!(merge_repo) update_satellite_source_and_target!(merge_repo) + if (merge_request.for_fork?) patch = merge_repo.git.format_patch(default_options({stdout: true}), "origin/#{merge_request.target_branch}...source/#{merge_request.source_branch}") else patch = merge_repo.git.format_patch(default_options({stdout: true}), "#{merge_request.target_branch}...#{merge_request.source_branch}") end + return patch end rescue Grit::Git::CommandFailed => ex @@ -139,7 +141,7 @@ module Gitlab # Assumes a satellite exists that is a fresh clone of the projects repo, prepares satellite for merges, diffs etc def update_satellite_source_and_target!(repo) - if merge_request.for_fork? + if merge_request.for_fork? repo.remote_add('source', merge_request.source_project.repository.path_to_repo) repo.remote_fetch('source') repo.git.checkout(default_options({b: true}), merge_request.target_branch, "origin/#{merge_request.target_branch}") |