summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAlex Denisov <1101.debian@gmail.com>2012-08-29 11:21:14 +0300
committerAlex Denisov <1101.debian@gmail.com>2012-08-29 11:21:14 +0300
commit05af5655a7e385018d640723e84a208c439f7f10 (patch)
treee1ee81e726f7e661365f916a10618a371f659cc9 /app
parent43cad71f1adbefe462f1c7216c8323c3f36704f4 (diff)
parent5afb16e4965e41af420211fa35bff0d2d0a07de7 (diff)
downloadgitlab-ce-05af5655a7e385018d640723e84a208c439f7f10.tar.gz
Merge branch 'master' into issue_status_changed_notifications
Diffstat (limited to 'app')
-rw-r--r--app/models/key.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/key.rb b/app/models/key.rb
index 8b61675a444..3890814cecf 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -10,6 +10,7 @@ class Key < ActiveRecord::Base
validates :key,
presence: true,
+ :format => { :with => /ssh-.{3} / },
length: { within: 0..5000 }
before_save :set_identifier