summaryrefslogtreecommitdiff
path: root/app/models/key.rb
diff options
context:
space:
mode:
authorValeriy Sizov <vsv2711@gmail.com>2012-10-09 01:17:38 -0700
committerValeriy Sizov <vsv2711@gmail.com>2012-10-09 01:17:38 -0700
commitdc33f71b181d154c8d9937f777fa16e9cf1d968d (patch)
tree1424eedeeeb4a9016d0f6dc5a5986c17e74e9122 /app/models/key.rb
parentc348284fedb487474626b3dae9be73311f8382df (diff)
parenta4cd738686659314f0bb9fd13a80845dc2b036ab (diff)
downloadgitlab-ce-dc33f71b181d154c8d9937f777fa16e9cf1d968d.tar.gz
Merge pull request #1656 from zzet/refactoring
Refactoring
Diffstat (limited to 'app/models/key.rb')
-rw-r--r--app/models/key.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/models/key.rb b/app/models/key.rb
index dc1f3cdb9f9..43db095067d 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -6,15 +6,14 @@ class Key < ActiveRecord::Base
attr_accessible :key, :title
+ before_validation :strip_white_space
+ before_save :set_identifier
+
validates :title, presence: true, length: { within: 0..255 }
- validates :key, presence: true,
- length: { within: 0..5000 },
- format: { :with => /ssh-.{3} / }
+ validates :key, presence: true, length: { within: 0..5000 }, format: { :with => /ssh-.{3} / }
+ validate :unique_key, :fingerprintable_key
- before_save :set_identifier
- before_validation :strip_white_space
delegate :name, :email, to: :user, prefix: true
- validate :unique_key, :fingerprintable_key
def strip_white_space
self.key = self.key.strip unless self.key.blank?