summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/key.rb4
-rw-r--r--app/models/merge_request.rb4
-rw-r--r--app/models/network/graph.rb2
-rw-r--r--app/models/note.rb2
4 files changed, 6 insertions, 6 deletions
diff --git a/app/models/key.rb b/app/models/key.rb
index 65a426d1f8b..d2d1af68822 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -19,7 +19,7 @@ class Key < ActiveRecord::Base
belongs_to :user
- before_validation :strip_white_space, :generate_fingerpint
+ before_validation :strip_white_space, :generate_fingerprint
validates :title, presence: true, length: { within: 0..255 }
validates :key, presence: true, length: { within: 0..5000 }, format: { with: /\A(ssh|ecdsa)-.*\Z/ }, uniqueness: true
@@ -76,7 +76,7 @@ class Key < ActiveRecord::Base
private
- def generate_fingerpint
+ def generate_fingerprint
self.fingerprint = nil
return unless key.present?
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index de0ee0e2c5a..9bc0afa6037 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -330,7 +330,7 @@ class MergeRequest < ActiveRecord::Base
end
# Return array of possible target branches
- # dependes on target project of MR
+ # depends on target project of MR
def target_branches
if target_project.nil?
[]
@@ -340,7 +340,7 @@ class MergeRequest < ActiveRecord::Base
end
# Return array of possible source branches
- # dependes on source project of MR
+ # depends on source project of MR
def source_branches
if source_project.nil?
[]
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 43979b5e807..7f761f2bdf2 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -84,7 +84,7 @@ module Network
skip += self.class.max_count
end
else
- # Cant't find the target commit in the repo.
+ # Can't find the target commit in the repo.
offset = 0
end
end
diff --git a/app/models/note.rb b/app/models/note.rb
index e99bc2668d6..b78c8b343a1 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -480,7 +480,7 @@ class Note < ActiveRecord::Base
end
# FIXME: Hack for polymorphic associations with STI
- # For more information wisit http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#label-Polymorphic+Associations
+ # For more information visit http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#label-Polymorphic+Associations
def noteable_type=(sType)
super(sType.to_s.classify.constantize.base_class.to_s)
end