[ARVADOS] updated: 43d6c4e398e53a43f5b52c556128a33c8f84f5a3

git at public.curoverse.com git at public.curoverse.com
Sat Sep 6 15:55:41 EDT 2014


Summary of changes:
 .../app/controllers/actions_controller.rb          |  4 ++-
 sdk/cli/bin/arv-run-pipeline-instance              | 36 ++++++++++++++-----
 services/api/Gemfile                               |  4 +--
 services/api/Gemfile.lock                          |  8 ++---
 .../api/app/controllers/application_controller.rb  | 42 +++++++++++++++++++++-
 .../arvados/v1/collections_controller_test.rb      | 18 ++++++++++
 6 files changed, 95 insertions(+), 17 deletions(-)

       via  43d6c4e398e53a43f5b52c556128a33c8f84f5a3 (commit)
       via  e386cf444082ac341978887fb8d2b3b13cbba060 (commit)
       via  0ac9eaceae35e2a466b0ad09c903384d9bd21b9e (commit)
       via  b60e52e031eeba96ef1a301660de2f8cec4518b6 (commit)
       via  15f512c3d8bc8bf090972653b3e53742197316e8 (commit)
       via  1c679ba62c8d7b0d962532bdb5fa2de4c685d286 (commit)
       via  3b7e5549bf4a17907f8e3236592bcbd5cf6ad623 (commit)
      from  2e255fb4aa0a1b7e0acfb1298a1625629ca18846 (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 43d6c4e398e53a43f5b52c556128a33c8f84f5a3
Merge: e386cf4 0ac9eac
Author: radhika <radhika at curoverse.com>
Date:   Sat Sep 6 15:53:17 2014 -0400

    Merge branch 'master' into 3654-combine-selections


commit e386cf444082ac341978887fb8d2b3b13cbba060
Author: radhika <radhika at curoverse.com>
Date:   Sat Sep 6 15:51:34 2014 -0400

    3654: slight update to redirect to newly created collection

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 52a89cc..fc29ec2 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -176,7 +176,9 @@ class ActionsController < ApplicationController
         format.js {render inline: "location.reload();" }
       end
     else
-      redirect_to controller: 'collections', action: :show, id: newc.uuid
+      respond_to do |format|
+        format.js {redirect_to url_for(controller: 'collections', action: :show, id: newc.uuid)}
+      end
     end
   end
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list