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 /app/models | |
| parent | 5e0e97ec5dd963a33a6522b0095a15abf987d6e0 (diff) | |
| download | gitlab-ce-cd19f82e5126e087ea6ef3b1bc3307bb74efacbd.tar.gz | |
Fix typos
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/namespace.rb | 2 | ||||
| -rw-r--r-- | app/models/network/graph.rb | 4 | ||||
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | app/models/wiki_page.rb | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index c74e0cf5a1d..18959166931 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -73,7 +73,7 @@ class Namespace < ActiveRecord::Base gitlab_shell.rm_satellites(path_was) send_update_instructions rescue - # Returning false does not rolback after_* transaction but gives + # Returning false does not rollback after_* transaction but gives # us information about failing some of tasks false end diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb index da815a85924..1d21e96369a 100644 --- a/app/models/network/graph.rb +++ b/app/models/network/graph.rb @@ -43,9 +43,9 @@ module Network # Method is adding time and space on the # list of commits. As well as returns date list - # corelated with time set on commits. + # correlated with time set on commits. # - # @return [Array<TimeDate>] list of commit dates corelated with time on commits + # @return [Array<TimeDate>] list of commit dates correlated with time on commits def index_commits days = [] @map = {} diff --git a/app/models/project.rb b/app/models/project.rb index 8297c11ba8a..497ed1a218c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -432,7 +432,7 @@ class Project < ActiveRecord::Base gitlab_shell.rm_satellites(old_path_with_namespace) send_move_instructions rescue - # Returning false does not rolback after_* transaction but gives + # Returning false does not rollback after_* transaction but gives # us information about failing some of tasks false end diff --git a/app/models/user.rb b/app/models/user.rb index 193349c95fc..a149b3a0322 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -155,7 +155,7 @@ class User < ActiveRecord::Base # Class methods # class << self - # Devise method overriden to allow sing in with email or username + # Devise method overridden to allow sing in with email or username def find_for_database_authentication(warden_conditions) conditions = warden_conditions.dup if login = conditions.delete(:login) diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 497d69e8e90..b7629b9f24c 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -143,7 +143,7 @@ class WikiPage save :update_page, @page, content, format, message end - # Destroys the WIki Page. + # Destroys the Wiki Page. # # Returns boolean True or False. def delete |