summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKevin Lyda <kevin@ie.suberic.net>2013-03-17 19:46:54 +0000
committerKevin Lyda <kevin@ie.suberic.net>2013-03-17 19:46:54 +0000
commit415bade302d6c3eef5810c7b812a8f608ef43001 (patch)
tree6e15be7ca5ecfe7463b86ef626b31295d4e922bf /lib
parenta96e0ec57ef6ae129a1adb54e5b9b67d8ffb04b3 (diff)
downloadgitlab-ce-415bade302d6c3eef5810c7b812a8f608ef43001.tar.gz
Result of misspellings run.
Most of these are comments but a few are strings for users. Might be an idea to run this from time to time: https://github.com/lyda/misspell-check It runs mostly clean now.
Diffstat (limited to 'lib')
-rw-r--r--lib/api/users.rb2
-rw-r--r--lib/gitlab/satellite/edit_file_action.rb2
-rw-r--r--lib/tasks/gitlab/task_helpers.rake4
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 1462e7b4c1d..e9cf16fa37d 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -62,7 +62,7 @@ module Gitlab
# skype - Skype ID
# linkedin - Linkedin
# twitter - Twitter account
- # projects_limit - Limit projects wich user can create
+ # projects_limit - Limit projects each user can create
# extern_uid - External authentication provider UID
# provider - External provider
# bio - Bio
diff --git a/lib/gitlab/satellite/edit_file_action.rb b/lib/gitlab/satellite/edit_file_action.rb
index e9053f904c0..07570965b1a 100644
--- a/lib/gitlab/satellite/edit_file_action.rb
+++ b/lib/gitlab/satellite/edit_file_action.rb
@@ -13,7 +13,7 @@ module Gitlab
# Updates the files content and creates a new commit for it
#
# Returns false if the ref has been updated while editing the file
- # Returns false if commiting the change fails
+ # Returns false if committing the change fails
# Returns false if pushing from the satellite to Gitolite failed or was rejected
# Returns true otherwise
def commit!(content, commit_message, last_commit)
diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake
index cb4e34cc0d7..cfab3670fb2 100644
--- a/lib/tasks/gitlab/task_helpers.rake
+++ b/lib/tasks/gitlab/task_helpers.rake
@@ -38,7 +38,7 @@ namespace :gitlab do
# Prompt the user to input something
#
# message - the message to display before input
- # choices - array of strings of acceptible answers or nil for any answer
+ # choices - array of strings of acceptable answers or nil for any answer
#
# Returns the user's answer
def prompt(message, choices = nil)
@@ -49,7 +49,7 @@ namespace :gitlab do
answer
end
- # Runs the given command and matches the output agains the given pattern
+ # Runs the given command and matches the output against the given pattern
#
# Returns nil if nothing matched
# Retunrs the MatchData if the pattern matched