Download as
Browse Code »

Commit 643ed9cbf3b0dd09e0ae22df55662d5b33b1d6c7

Authored by Riyad Preukschas
1 parent 0447ab37
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix typos in Gitlab::Merge

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