[ARVADOS] updated: ea3fe8ea10b641406abfde8e6831b38cc6c51f62

git at public.curoverse.com git at public.curoverse.com
Thu Dec 26 14:01:35 EST 2013


Summary of changes:
 .../app/controllers/authorized_keys_controller.rb  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

       via  ea3fe8ea10b641406abfde8e6831b38cc6c51f62 (commit)
      from  a75d871fff6f85f2a102d0f17b6219cfe799abe0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ea3fe8ea10b641406abfde8e6831b38cc6c51f62
Author: Tom Clegg <tom at clinicalfuture.com>
Date:   Thu Dec 26 11:01:15 2013 -0800

    Fix exception when no authorized_key hash provided in create request.

diff --git a/apps/workbench/app/controllers/authorized_keys_controller.rb b/apps/workbench/app/controllers/authorized_keys_controller.rb
index 4487ead..6bbb01d 100644
--- a/apps/workbench/app/controllers/authorized_keys_controller.rb
+++ b/apps/workbench/app/controllers/authorized_keys_controller.rb
@@ -7,7 +7,7 @@ class AuthorizedKeysController < ApplicationController
 
   def create
     defaults = { authorized_user_uuid: current_user.uuid, key_type: 'SSH' }
-    @object = AuthorizedKey.new defaults.merge(params[:authorized_key])
+    @object = AuthorizedKey.new defaults.merge(params[:authorized_key] || {})
     super
   end
 end

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list