Remove gitolite mention
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
8841eec426
commit
60959df3f2
|
@ -8,13 +8,13 @@ module Gitlab
|
|||
#
|
||||
# Returns false if the ref has been updated while editing the file
|
||||
# Returns false if committing the change fails
|
||||
# Returns false if pushing from the satellite to Gitolite failed or was rejected
|
||||
# Returns false if pushing from the satellite to bare repo failed or was rejected
|
||||
# Returns true otherwise
|
||||
def commit!(content, commit_message)
|
||||
in_locked_and_timed_satellite do |repo|
|
||||
prepare_satellite!(repo)
|
||||
|
||||
# create target branch in satellite at the corresponding commit from Gitolite
|
||||
# create target branch in satellite at the corresponding commit from bare repo
|
||||
repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
|
||||
|
||||
# update the file in the satellite's working dir
|
||||
|
@ -26,7 +26,7 @@ module Gitlab
|
|||
repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
|
||||
|
||||
|
||||
# push commit back to Gitolite
|
||||
# push commit back to bare repo
|
||||
# will raise CommandFailed when push fails
|
||||
repo.git.push({raise: true, timeout: true}, :origin, ref)
|
||||
|
||||
|
|
|
@ -7,13 +7,13 @@ module Gitlab
|
|||
#
|
||||
# Returns false if the ref has been updated while editing the file
|
||||
# Returns false if committing the change fails
|
||||
# Returns false if pushing from the satellite to Gitolite failed or was rejected
|
||||
# Returns false if pushing from the satellite to bare repo failed or was rejected
|
||||
# Returns true otherwise
|
||||
def commit!(content, commit_message)
|
||||
in_locked_and_timed_satellite do |repo|
|
||||
prepare_satellite!(repo)
|
||||
|
||||
# create target branch in satellite at the corresponding commit from Gitolite
|
||||
# create target branch in satellite at the corresponding commit from bare repo
|
||||
repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
|
||||
|
||||
# update the file in the satellite's working dir
|
||||
|
@ -28,7 +28,7 @@ module Gitlab
|
|||
repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
|
||||
|
||||
|
||||
# push commit back to Gitolite
|
||||
# push commit back to bare repo
|
||||
# will raise CommandFailed when push fails
|
||||
repo.git.push({raise: true, timeout: true}, :origin, ref)
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ module Gitlab
|
|||
in_locked_and_timed_satellite do |merge_repo|
|
||||
prepare_satellite!(merge_repo)
|
||||
if merge_in_satellite!(merge_repo)
|
||||
# push merge back to Gitolite
|
||||
# push merge back to bare repo
|
||||
# will raise CommandFailed when push fails
|
||||
merge_repo.git.push(default_options, :origin, merge_request.target_branch)
|
||||
# remove source branch
|
||||
|
|
|
@ -123,7 +123,7 @@ module Gitlab
|
|||
remotes.each { |name| repo.git.remote(default_options,'rm', name)}
|
||||
end
|
||||
|
||||
# Updates the satellite from Gitolite
|
||||
# Updates the satellite from bare repo
|
||||
#
|
||||
# Note: this will only update remote branches (i.e. origin/*)
|
||||
def update_from_source!
|
||||
|
|
Loading…
Reference in New Issue