deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-26 00:33:53 +02:00
parent 8c89beb6f9
commit 55779b00ea
4 changed files with 46 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/satellite/merge_action.rb
View file

@ -55,11 +55,11 @@ module Gitlab
prepare_satellite!(repo)
# create target branch in satellite at the corresponding commit from Gitolite
repo.git.checkout({b: true}, merge_request.target_branch, "origin/#{merge_request.target_branch}")
repo.git.checkout({raise: true, b: true}, merge_request.target_branch, "origin/#{merge_request.target_branch}")
# merge the source branch from Gitolite into the satellite
# will raise CommandFailed when merge fails
repo.git.pull({no_ff: true, raise: true}, :origin, merge_request.source_branch)
repo.git.pull({raise: true, no_ff: true}, :origin, merge_request.source_branch)
rescue Grit::Git::CommandFailed => ex
Gitlab::GitLogger.error(ex.message)
false