Merge branch 'master' into issue_status_changed_notifications

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

features/profile/ssh_keys.feature

@@ -3,8 +3,8 @@ Feature: SSH Keys
     Given I signin as a user
     And I have ssh keys:
       | title | 
-      | Work |
-      | Home | 
+      | ssh-rsa Work |
+      | ssh-rsa Home |
     And I visit profile keys page
 
   Scenario: I should see SSH keys

features/step_definitions/profile/profile_keys_steps.rb

@@ -16,7 +16,7 @@ end
 
 Given /^I submit new ssh key "(.*?)"$/ do |arg1|
   fill_in "key_title", :with => arg1
-  fill_in "key_key", :with => "publickey234="
+  fill_in "key_key", :with => "ssh-rsa publickey234="
   click_button "Save"
 end
 

spec/requests/projects_deploy_keys_spec.rb

@@ -42,7 +42,7 @@ describe "Projects", "DeployKeys" do
     describe "fill in" do
       before do
         fill_in "key_title", with: "laptop"
-        fill_in "key_key", with: "publickey234="
+        fill_in "key_key", with: "ssh-rsa publickey234="
       end
 
       it { expect { click_button "Save" }.to change {Key.count}.by(1) }
@@ -55,12 +55,12 @@ describe "Projects", "DeployKeys" do
     end
   end
 
-  describe "Show page" do 
+  describe "Show page" do
     before do
       @key = Factory :key, project: project
-      visit project_deploy_key_path(project, @key) 
+      visit project_deploy_key_path(project, @key)
     end
-    
+
     it { page.should have_content @key.title }
     it { page.should have_content @key.key[0..10] }
   end