Merge branch 'master' into issue_status_changed_notifications

dnaeon · Aug 29, 2012 · 05af565 · 05af565
2 parents 43cad71 + 5afb16e
commit 05af565
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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

diff --git a/spec/factories.rb b/spec/factories.rb
@@ -77,7 +77,7 @@ def self.new(type, *args)
     title
     key do
       """
-      AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
+      ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
       596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
       soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=
       """