[ARVADOS] updated: a285726d2297f71254529ab7d5b02f9246a0c413

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/collections/show.html.erb               | 4 +---
 apps/workbench/app/views/collections/show_file_links.html.erb    | 2 +-
 apps/workbench/app/views/jobs/_show_status.html.erb              | 4 ++--
 .../db/migrate/20140601022548_remove_name_from_collections.rb    | 9 +++++++++
 services/api/db/schema.rb                                        | 4 +---
 5 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 services/api/db/migrate/20140601022548_remove_name_from_collections.rb

       via  a285726d2297f71254529ab7d5b02f9246a0c413 (commit)
       via  e881778afbede03d32b842334113cba198052cfb (commit)
       via  cff73e6feea770c80d9a63168de2be7cb6663a4d (commit)
      from  18e7ea91bc5e9cd7cd1f25bd009a67e6fd2cc06b (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 a285726d2297f71254529ab7d5b02f9246a0c413
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jun 2 09:21:56 2014 -0400

    2939: Use JSON.dump instead of Oj.dump, solves the symbol keys problem.

diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb
index 08317de..660aa95 100644
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -6,7 +6,7 @@ Re-run job using version:
   <%= hidden_field :job, d, :value => @object[d] %>
 <% end %>
 <% [:script_parameters, :runtime_constraints].each do |d| %>
-  <%= hidden_field :job, d, :value => Oj.dump(@object[d]) %>
+  <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
 <% end %>
 <%= hidden_field :options, :no_reuse, :value => true %>
 <%= button_tag "Same (#{@object.script_version.slice 0,8}...)", {class: 'btn btn-primary', id: "run-pipeline-button"} %>
@@ -18,7 +18,7 @@ Re-run job using version:
 <% end %>
 <%= hidden_field :job, :script_version, :value => @object[:supplied_script_version] %>
 <% [:script_parameters, :runtime_constraints].each do |d| %>
-  <%= hidden_field :job, d, :value => Oj.dump(@object[d]) %>
+  <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
 <% end %>
 <%= hidden_field :options, :no_reuse, :value => true %>
 <%= button_tag "Latest (#{@object.repository}/#{@object.supplied_script_version})", {class: 'btn btn-primary', id: "run-pipeline-button"} %>

commit e881778afbede03d32b842334113cba198052cfb
Merge: 18e7ea9 cff73e6
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jun 2 08:52:06 2014 -0400

    Merge remote-tracking branch 'origin/master' into origin-2939-re-run-job-button refs #2939
    
    Conflicts:
    	services/api/db/schema.rb

diff --cc services/api/db/schema.rb
index d6be906,8a61425..c63a312
--- a/services/api/db/schema.rb
+++ b/services/api/db/schema.rb
@@@ -11,9 -11,9 +11,8 @@@
  #
  # It's strongly recommended to check this file into your version control system.
  
- ActiveRecord::Schema.define(:version => 20140530200539) do
 -ActiveRecord::Schema.define(:version => 20140601022548) do
--
  
++ActiveRecord::Schema.define(:version => 20140601022548) do
  
    create_table "api_client_authorizations", :force => true do |t|
      t.string   "api_token",                                           :null => false

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


hooks/post-receive
--