diff options
| author | Johannes Schleifenbaum <johannes@js-webcoding.de> | 2013-07-29 12:46:00 +0200 |
|---|---|---|
| committer | Johannes Schleifenbaum <johannes@js-webcoding.de> | 2013-07-29 12:47:06 +0200 |
| commit | cd19f82e5126e087ea6ef3b1bc3307bb74efacbd (patch) | |
| tree | 83c0eeabeedec6a14262bcf0edc776adf5ef332d /lib | |
| parent | 5e0e97ec5dd963a33a6522b0095a15abf987d6e0 (diff) | |
| download | gitlab-ce-cd19f82e5126e087ea6ef3b1bc3307bb74efacbd.tar.gz | |
Fix typos
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/backend/shell.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/backend/shell_env.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/satellite/satellite.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/cleanup.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/enable_namespaces.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/task_helpers.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/migrate/migrate_groups.rake | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb index d0b89f85ade..c819ce56ac9 100644 --- a/lib/gitlab/backend/shell.rb +++ b/lib/gitlab/backend/shell.rb @@ -142,7 +142,7 @@ module Gitlab # Remove all ssh keys from gitlab shell # # Ex. - # remmove_all_keys + # remove_all_keys # def remove_all_keys system "#{gitlab_shell_user_home}/gitlab-shell/bin/gitlab-keys", "clear" diff --git a/lib/gitlab/backend/shell_env.rb b/lib/gitlab/backend/shell_env.rb index 15721875093..044afb27f3f 100644 --- a/lib/gitlab/backend/shell_env.rb +++ b/lib/gitlab/backend/shell_env.rb @@ -1,6 +1,6 @@ module Gitlab # This module provide 2 methods - # to set specific ENV variabled for GitLab Shell + # to set specific ENV variables for GitLab Shell module ShellEnv extend self diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 4c7be04246c..69f8551661b 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -116,7 +116,7 @@ module Gitlab repo.git.fetch({timeout: true}, :origin) end - # Create directory for stroing + # Create directory for storing # satellites lock files def create_locks_dir FileUtils.mkdir_p(lock_files_dir) diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake index 186abc65563..4aaab11340f 100644 --- a/lib/tasks/gitlab/cleanup.rake +++ b/lib/tasks/gitlab/cleanup.rake @@ -43,7 +43,7 @@ namespace :gitlab do end end - desc "GITLAB | Cleanup | Clean respositories" + desc "GITLAB | Cleanup | Clean repositories" task repos: :environment do warn_user_is_not_gitlab remove_flag = ENV['REMOVE'] diff --git a/lib/tasks/gitlab/enable_namespaces.rake b/lib/tasks/gitlab/enable_namespaces.rake index 6b7b75fd1b6..927748c0fd5 100644 --- a/lib/tasks/gitlab/enable_namespaces.rake +++ b/lib/tasks/gitlab/enable_namespaces.rake @@ -42,7 +42,7 @@ namespace :gitlab do username = user.email.match(/^[^@]*/)[0] username.gsub!("+", ".") - # return username if no mathes + # return username if no matches return username unless User.find_by_username(username) # look for same username diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake index 34a4a322c11..f84257d15b5 100644 --- a/lib/tasks/gitlab/task_helpers.rake +++ b/lib/tasks/gitlab/task_helpers.rake @@ -55,7 +55,7 @@ namespace :gitlab do # Runs the given command and matches the output against the given pattern # # Returns nil if nothing matched - # Retunrs the MatchData if the pattern matched + # Returns the MatchData if the pattern matched # # see also #run # see also String#match diff --git a/lib/tasks/migrate/migrate_groups.rake b/lib/tasks/migrate/migrate_groups.rake index 153172dc90a..49c930a4893 100644 --- a/lib/tasks/migrate/migrate_groups.rake +++ b/lib/tasks/migrate/migrate_groups.rake @@ -1,4 +1,4 @@ -desc "GITLAB | Migrate Gropus to match v6.0" +desc "GITLAB | Migrate Groups to match v6.0" task migrate_groups: :environment do puts "This will add group owners to group membership" ask_to_continue |