diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-08 12:12:46 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-08 12:12:46 +0300 |
| commit | c7e490ebd5ab69fe043cd39145bd6ef3850a6921 (patch) | |
| tree | 8cbb7e5615d2c7f1274fdbac240c21619cce71ec /lib | |
| parent | d19d094b935b6b1b773d369893d4f112e91b38a9 (diff) | |
| parent | 9a900dbb7104582a9d6c65e48d50cd921d009dc0 (diff) | |
| download | gitlab-ce-c7e490ebd5ab69fe043cd39145bd6ef3850a6921.tar.gz | |
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/satellite/merge_action.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb index 969bb999936..156483be8dd 100644 --- a/lib/gitlab/satellite/merge_action.rb +++ b/lib/gitlab/satellite/merge_action.rb @@ -90,9 +90,9 @@ module Gitlab 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}") + 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}") + patch = merge_repo.git.format_patch(default_options({stdout: true}), "#{merge_request.target_branch}..#{merge_request.source_branch}") end return patch |