[ARVADOS] updated: 89158222661a806cd27299054f6f50ee906d92e1

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/actions_controller.rb | 7 +------
 apps/workbench/app/views/users/_setup_popup.html.erb | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

       via  89158222661a806cd27299054f6f50ee906d92e1 (commit)
       via  224c45d3c600e879626c675247da7612f0c95891 (commit)
       via  f879aadfdf3b53036069dc40116188ae5077810e (commit)
      from  136c0dd03fd3df62c2f9d47d29481bc68c9c1333 (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 89158222661a806cd27299054f6f50ee906d92e1
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 30 15:57:30 2014 -0400

    2985: let errors propagate during save

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 9f2cfb0..e3cdd55 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -70,12 +70,7 @@ class ActionsController < ApplicationController
           dst.owner_uuid = @object.uuid
           dst.tail_uuid = @object.uuid if dst.class == Link
         end
-        begin
-          dst.save!
-        rescue
-          dst.name += " (#{Time.now.localtime})" if dst.respond_to? :name=
-          dst.save!
-        end
+        dst.save!
       end
     end
     redirect_to @object

commit 224c45d3c600e879626c675247da7612f0c95891
Merge: 136c0dd f879aad
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 30 15:43:51 2014 -0400

    Merge branch 'master' into 2985-selection-button-move-copy


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


hooks/post-receive
--