[ARVADOS] updated: 9c08bbbac2f53eaf8da42d6cf5dd3fbc7f5d5756

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/application.default.yml                           | 2 +-
 apps/workbench/config/application.rb                                    | 2 ++
 .../config/{initializers/zza_load_config.rb => load_config.rb}          | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename apps/workbench/config/{initializers/zza_load_config.rb => load_config.rb} (100%)

       via  9c08bbbac2f53eaf8da42d6cf5dd3fbc7f5d5756 (commit)
       via  5dc59d92a10dadece113e807e2370d74c364b4dd (commit)
      from  17c73c85f302fca9a1b426f9105dd999ad465f28 (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 9c08bbbac2f53eaf8da42d6cf5dd3fbc7f5d5756
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri May 9 20:29:09 2014 -0400

    Turn off secret_key_base by default, instead of requiring it in config.

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 533382e..2fe701a 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -71,6 +71,6 @@ common:
   arvados_theme: default
   show_user_agreement_inline: false
   secret_token: ~
-  secret_key_base: ~
+  secret_key_base: false
   default_openid_prefix: https://www.google.com/accounts/o8/id
   send_user_setup_notification_email: true

commit 5dc59d92a10dadece113e807e2370d74c364b4dd
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri May 9 20:28:40 2014 -0400

    Fix load_config so it loads in time to set passenger configs.

diff --git a/apps/workbench/config/application.rb b/apps/workbench/config/application.rb
index c456bb1..4ac6819 100644
--- a/apps/workbench/config/application.rb
+++ b/apps/workbench/config/application.rb
@@ -49,3 +49,5 @@ module ArvadosWorkbench
     config.assets.version = '1.0'
   end
 end
+
+require File.expand_path('../load_config', __FILE__)
diff --git a/apps/workbench/config/initializers/zza_load_config.rb b/apps/workbench/config/load_config.rb
similarity index 100%
rename from apps/workbench/config/initializers/zza_load_config.rb
rename to apps/workbench/config/load_config.rb

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


hooks/post-receive
--