Commit 643ed9cbf3b0dd09e0ae22df55662d5b33b1d6c7
1 parent
0447ab37
Exists in
master
and in
4 other branches
Fix typos in Gitlab::Merge
Showing
1 changed file
with
4 additions
and
4 deletions
Show diff stats
lib/gitlab/merge.rb
| @@ -19,7 +19,7 @@ module Gitlab | @@ -19,7 +19,7 @@ module Gitlab | ||
| 19 | # It also removes the source branch if requested in the merge request. | 19 | # It also removes the source branch if requested in the merge request. |
| 20 | # | 20 | # |
| 21 | # Returns false if the merge produced conflicts | 21 | # Returns false if the merge produced conflicts |
| 22 | - # Returns false if pushing from the satallite to Gitolite failed or was rejected | 22 | + # Returns false if pushing from the satellite to Gitolite failed or was rejected |
| 23 | # Returns true otherwise | 23 | # Returns true otherwise |
| 24 | def merge! | 24 | def merge! |
| 25 | in_locked_and_timed_satellite do |merge_repo| | 25 | in_locked_and_timed_satellite do |merge_repo| |
| @@ -46,7 +46,7 @@ module Gitlab | @@ -46,7 +46,7 @@ module Gitlab | ||
| 46 | 46 | ||
| 47 | # * Sets a 30s timeout for Git | 47 | # * Sets a 30s timeout for Git |
| 48 | # * Locks the satellite repo | 48 | # * Locks the satellite repo |
| 49 | - # * Yields the prepared satallite repo | 49 | + # * Yields the prepared satellite repo |
| 50 | def in_locked_and_timed_satellite | 50 | def in_locked_and_timed_satellite |
| 51 | Grit::Git.with_timeout(30.seconds) do | 51 | Grit::Git.with_timeout(30.seconds) do |
| 52 | lock_file = Rails.root.join("tmp", "#{project.path}.lock") | 52 | lock_file = Rails.root.join("tmp", "#{project.path}.lock") |
| @@ -78,7 +78,7 @@ module Gitlab | @@ -78,7 +78,7 @@ module Gitlab | ||
| 78 | # Returns false if the merge produced conflicts | 78 | # Returns false if the merge produced conflicts |
| 79 | # Returns true otherwise | 79 | # Returns true otherwise |
| 80 | def merge_in_satellite!(repo) | 80 | def merge_in_satellite!(repo) |
| 81 | - prepare_satelite!(repo) | 81 | + prepare_satellite!(repo) |
| 82 | 82 | ||
| 83 | # create target branch in satellite at the corresponding commit from Gitolite | 83 | # create target branch in satellite at the corresponding commit from Gitolite |
| 84 | repo.git.checkout({b: true}, merge_request.target_branch, "origin/#{merge_request.target_branch}") | 84 | repo.git.checkout({b: true}, merge_request.target_branch, "origin/#{merge_request.target_branch}") |
| @@ -93,7 +93,7 @@ module Gitlab | @@ -93,7 +93,7 @@ module Gitlab | ||
| 93 | # * Clears the satellite | 93 | # * Clears the satellite |
| 94 | # * Updates the satellite from Gitolite | 94 | # * Updates the satellite from Gitolite |
| 95 | # * Sets up Git variables for the user | 95 | # * Sets up Git variables for the user |
| 96 | - def prepare_satelite!(repo) | 96 | + def prepare_satellite!(repo) |
| 97 | project.satellite.clear | 97 | project.satellite.clear |
| 98 | 98 | ||
| 99 | repo.git.reset(hard: true) | 99 | repo.git.reset(hard: true) |