Commit 60959df3f276d7f50a9a3c759e4fc871183aa0d4
1 parent
8841eec4
Exists in
master
and in
4 other branches
Remove gitolite mention
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
4 changed files
with
8 additions
and
8 deletions
Show diff stats
lib/gitlab/satellite/files/edit_file_action.rb
| @@ -8,13 +8,13 @@ module Gitlab | @@ -8,13 +8,13 @@ module Gitlab | ||
| 8 | # | 8 | # |
| 9 | # Returns false if the ref has been updated while editing the file | 9 | # Returns false if the ref has been updated while editing the file |
| 10 | # Returns false if committing the change fails | 10 | # Returns false if committing the change fails |
| 11 | - # Returns false if pushing from the satellite to Gitolite failed or was rejected | 11 | + # Returns false if pushing from the satellite to bare repo failed or was rejected |
| 12 | # Returns true otherwise | 12 | # Returns true otherwise |
| 13 | def commit!(content, commit_message) | 13 | def commit!(content, commit_message) |
| 14 | in_locked_and_timed_satellite do |repo| | 14 | in_locked_and_timed_satellite do |repo| |
| 15 | prepare_satellite!(repo) | 15 | prepare_satellite!(repo) |
| 16 | 16 | ||
| 17 | - # create target branch in satellite at the corresponding commit from Gitolite | 17 | + # create target branch in satellite at the corresponding commit from bare repo |
| 18 | repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}") | 18 | repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}") |
| 19 | 19 | ||
| 20 | # update the file in the satellite's working dir | 20 | # update the file in the satellite's working dir |
| @@ -26,7 +26,7 @@ module Gitlab | @@ -26,7 +26,7 @@ module Gitlab | ||
| 26 | repo.git.commit(raise: true, timeout: true, a: true, m: commit_message) | 26 | repo.git.commit(raise: true, timeout: true, a: true, m: commit_message) |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | - # push commit back to Gitolite | 29 | + # push commit back to bare repo |
| 30 | # will raise CommandFailed when push fails | 30 | # will raise CommandFailed when push fails |
| 31 | repo.git.push({raise: true, timeout: true}, :origin, ref) | 31 | repo.git.push({raise: true, timeout: true}, :origin, ref) |
| 32 | 32 |
lib/gitlab/satellite/files/new_file_action.rb
| @@ -7,13 +7,13 @@ module Gitlab | @@ -7,13 +7,13 @@ module Gitlab | ||
| 7 | # | 7 | # |
| 8 | # Returns false if the ref has been updated while editing the file | 8 | # Returns false if the ref has been updated while editing the file |
| 9 | # Returns false if committing the change fails | 9 | # Returns false if committing the change fails |
| 10 | - # Returns false if pushing from the satellite to Gitolite failed or was rejected | 10 | + # Returns false if pushing from the satellite to bare repo failed or was rejected |
| 11 | # Returns true otherwise | 11 | # Returns true otherwise |
| 12 | def commit!(content, commit_message) | 12 | def commit!(content, commit_message) |
| 13 | in_locked_and_timed_satellite do |repo| | 13 | in_locked_and_timed_satellite do |repo| |
| 14 | prepare_satellite!(repo) | 14 | prepare_satellite!(repo) |
| 15 | 15 | ||
| 16 | - # create target branch in satellite at the corresponding commit from Gitolite | 16 | + # create target branch in satellite at the corresponding commit from bare repo |
| 17 | repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}") | 17 | repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}") |
| 18 | 18 | ||
| 19 | # update the file in the satellite's working dir | 19 | # update the file in the satellite's working dir |
| @@ -28,7 +28,7 @@ module Gitlab | @@ -28,7 +28,7 @@ module Gitlab | ||
| 28 | repo.git.commit(raise: true, timeout: true, a: true, m: commit_message) | 28 | repo.git.commit(raise: true, timeout: true, a: true, m: commit_message) |
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | - # push commit back to Gitolite | 31 | + # push commit back to bare repo |
| 32 | # will raise CommandFailed when push fails | 32 | # will raise CommandFailed when push fails |
| 33 | repo.git.push({raise: true, timeout: true}, :origin, ref) | 33 | repo.git.push({raise: true, timeout: true}, :origin, ref) |
| 34 | 34 |
lib/gitlab/satellite/merge_action.rb
| @@ -28,7 +28,7 @@ module Gitlab | @@ -28,7 +28,7 @@ module Gitlab | ||
| 28 | in_locked_and_timed_satellite do |merge_repo| | 28 | in_locked_and_timed_satellite do |merge_repo| |
| 29 | prepare_satellite!(merge_repo) | 29 | prepare_satellite!(merge_repo) |
| 30 | if merge_in_satellite!(merge_repo) | 30 | if merge_in_satellite!(merge_repo) |
| 31 | - # push merge back to Gitolite | 31 | + # push merge back to bare repo |
| 32 | # will raise CommandFailed when push fails | 32 | # will raise CommandFailed when push fails |
| 33 | merge_repo.git.push(default_options, :origin, merge_request.target_branch) | 33 | merge_repo.git.push(default_options, :origin, merge_request.target_branch) |
| 34 | # remove source branch | 34 | # remove source branch |
lib/gitlab/satellite/satellite.rb
| @@ -123,7 +123,7 @@ module Gitlab | @@ -123,7 +123,7 @@ module Gitlab | ||
| 123 | remotes.each { |name| repo.git.remote(default_options,'rm', name)} | 123 | remotes.each { |name| repo.git.remote(default_options,'rm', name)} |
| 124 | end | 124 | end |
| 125 | 125 | ||
| 126 | - # Updates the satellite from Gitolite | 126 | + # Updates the satellite from bare repo |
| 127 | # | 127 | # |
| 128 | # Note: this will only update remote branches (i.e. origin/*) | 128 | # Note: this will only update remote branches (i.e. origin/*) |
| 129 | def update_from_source! | 129 | def update_from_source! |