Merge branch 'master' into issue_status_changed_notifications

2012-08-29 11:42:15 +03:00 · 2012-08-29 11:42:15 +03:00 · 2703fe3e72
commit 2703fe3e72
parent 05af5655a7 adc71b6a6a
4 changed files with 10 additions and 8 deletions
--- a/app/models/key.rb
+++ b/app/models/key.rb
@ -4,13 +4,15 @@ class Key < ActiveRecord::Base
  belongs_to :user
  belongs_to :project

+  attr_protected :user_id
+
  validates :title,
            presence: true,
            length: { within: 0..255 }

  validates :key,
            presence: true,
-            :format => { :with => /ssh-.{3} / },
+            format: { :with => /ssh-.{3} / },
            length: { within: 0..5000 }

  before_save :set_identifier