[ARVADOS] updated: 451932825673c60dbb0a3ac93c42fbbfbb340af5

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb  | 1 -
 apps/workbench/app/helpers/application_helper.rb          | 2 +-
 apps/workbench/app/views/collections/_show_files.html.erb | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

  discards  95a589bcfe740fed72163f3e76e516b8bba5b0cd (commit)
  discards  6823c3502d4cb11b7da56740211da299eb100ed9 (commit)
  discards  44f985b09a2896e29d31147a6560a03fb4ed2397 (commit)
       via  451932825673c60dbb0a3ac93c42fbbfbb340af5 (commit)
       via  f36224ae5f8c2e68cabea4aa6aa3b58f7eb58b73 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (95a589bcfe740fed72163f3e76e516b8bba5b0cd)
            \
             N -- N -- N (451932825673c60dbb0a3ac93c42fbbfbb340af5)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 451932825673c60dbb0a3ac93c42fbbfbb340af5
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Nov 11 18:32:50 2015 -0500

    5824: Fix clear-download-dir helper.

diff --git a/apps/workbench/test/helpers/download_helper.rb b/apps/workbench/test/helpers/download_helper.rb
index 21fb4cd..8f387f4 100644
--- a/apps/workbench/test/helpers/download_helper.rb
+++ b/apps/workbench/test/helpers/download_helper.rb
@@ -6,7 +6,7 @@ module DownloadHelper
   end
 
   def clear
-    FileUtils.rm_f path
+    FileUtils.rm_r path
     begin
       Dir.mkdir path
     rescue Errno::EEXIST

commit f36224ae5f8c2e68cabea4aa6aa3b58f7eb58b73
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Nov 11 18:32:23 2015 -0500

    5824: Fix path and query escapes.
    
    Paths encode spaces as "%20", not "+".
    
    Rails to_query helper does undesirable things like
    "disposition[]=attachment".

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 0806a0a..f8b359c 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -1,6 +1,5 @@
 require "arvados/keep"
 require "uri"
-require "cgi"
 
 class CollectionsController < ApplicationController
   include ActionController::Live
@@ -369,9 +368,9 @@ class CollectionsController < ApplicationController
       uri.path += 't=' + opts[:path_token] + '/'
     end
     uri.path += '_/'
-    uri.path += CGI::escape(file)
+    uri.path += URI.escape(file)
 
-    query = CGI::parse(uri.query || '')
+    query = Hash[URI.decode_www_form(uri.query || '')]
     { query_token: 'api_token',
       disposition: 'disposition' }.each do |opt, param|
       if opts.include? opt
@@ -379,7 +378,7 @@ class CollectionsController < ApplicationController
       end
     end
     unless query.empty?
-      uri.query = query.to_query
+      uri.query = URI.encode_www_form(query)
     end
 
     uri.to_s

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


hooks/post-receive
--