[ARVADOS] updated: b9d9994d81f26d742c1bf3b5c1623a6c7a099f0b

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/models/arvados_api_client.rb       |  2 +-
 apps/workbench/app/models/arvados_base.rb             | 14 +++++---------
 doc/install/install-workbench-app.html.textile.liquid | 11 +++++++++++
 3 files changed, 17 insertions(+), 10 deletions(-)

       via  b9d9994d81f26d742c1bf3b5c1623a6c7a099f0b (commit)
       via  35097e1702f8da9d07d2cc0815cbbe5835a8a072 (commit)
       via  b8ac42db7b2105950cb7a815ded915fcb561a5b7 (commit)
      from  9c08bbbac2f53eaf8da42d6cf5dd3fbc7f5d5756 (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 b9d9994d81f26d742c1bf3b5c1623a6c7a099f0b
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed May 14 13:26:42 2014 -0400

    #2809: Remove debug printfs, add comment explaining why so much "permit!"

diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index aea6b77..1ad0230 100644
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -30,14 +30,7 @@ class ArvadosBase < ActiveRecord::Base
   end
 
   def initialize raw_params={}
-    begin
-      super self.class.permit_attribute_params(raw_params)
-    rescue Exception => e
-      logger.debug raw_params
-      logger.debug self.class.permit_attribute_params(raw_params).inspect
-      logger.debug self.class.attribute_info.inspect
-      raise e
-    end
+    super self.class.permit_attribute_params(raw_params)
     @attribute_sortkey ||= {
       'id' => nil,
       'name' => '000',
@@ -144,11 +137,14 @@ class ArvadosBase < ActiveRecord::Base
     # strong_parameters does not provide security in Workbench: anyone
     # who can get this far can just as well do a call directly to our
     # database (Arvados) with the same credentials we use.
+    #
+    # The following permit! is necessary even with
+    # "ActionController::Parameters.permit_all_parameters = true",
+    # because permit_all does not permit nested attributes.
     ActionController::Parameters.new(raw_params).permit!
   end
 
   def self.create raw_params={}
-    logger.error permit_attribute_params(raw_params).inspect
     super(permit_attribute_params(raw_params))
   end
 

commit 35097e1702f8da9d07d2cc0815cbbe5835a8a072
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed May 14 13:25:24 2014 -0400

    #2809: Add note about harmless warning when installing the themes_for_rails gem.

diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index eaf4ede..055ef47 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -49,6 +49,17 @@ Alternatively, if you don't have sudo/root privileges on the host, install the g
 ~/arvados/apps/workbench$ <span class="userinput">bundle install --path=vendor/bundle</span>
 </code></pre></notextile>
 
+The @bundle install@ command might produce a warning about the themes_for_rails gem. This is OK:
+
+<notextile>
+<pre><code>themes_for_rails at /home/<b>you</b>/.rvm/gems/ruby-2.1.1/bundler/gems/themes_for_rails-1fd2d7897d75 did not have a valid gemspec.
+This prevents bundler from installing bins or native extensions, but that may not affect its functionality.
+The validation message from Rubygems was:
+  duplicate dependency on rails (= 3.0.11, development), (>= 3.0.0) use:
+    add_runtime_dependency 'rails', '= 3.0.11', '>= 3.0.0'
+Using themes_for_rails (0.5.1) from https://github.com/holtkampw/themes_for_rails (at 1fd2d78)
+</code></pre></notextile>
+
 h2. Configure the Workbench application
 
 This application needs a secret token. Generate a new secret:

commit b8ac42db7b2105950cb7a815ded915fcb561a5b7
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed May 14 13:08:04 2014 -0400

    #2809: Fix whitespace.

diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index 9a2b0ce..dc1b6ed 100644
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -69,7 +69,7 @@ class ArvadosApiClient
 
     profile_checkpoint { "Prepare request #{url} #{query[:uuid]} #{query[:where]}" }
     msg = @client_mtx.synchronize do
-      @api_client.post(url, 
+      @api_client.post(url,
                        query,
                        header: header)
     end

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


hooks/post-receive
--