[ARVADOS] updated: 90f5ffab02a256828d43e6c04b511b47fa6ea2a9

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/application.default.yml      |    2 +-
 .../config/environments/development.rb.example     |   20 --------------------
 .../config/environments/production.rb.example      |   19 -------------------
 apps/workbench/config/environments/test.rb.example |   19 -------------------
 4 files changed, 1 insertions(+), 59 deletions(-)

       via  90f5ffab02a256828d43e6c04b511b47fa6ea2a9 (commit)
       via  9e3d3a05f976ff795418ebdcc480f1a7afd9d4de (commit)
      from  b8b693c0c8db03a251d51eb42b46ea1faf719b1a (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 90f5ffab02a256828d43e6c04b511b47fa6ea2a9
Merge: 9e3d3a0 b8b693c
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Mar 21 16:03:38 2014 -0400

    Merge branch 'master' of git.curoverse.com:arvados


commit 9e3d3a05f976ff795418ebdcc480f1a7afd9d4de
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Mar 21 16:02:29 2014 -0400

    Strip all arvados-specific settings from the .example environment files.
    These are now all configured via application(.defaults).yml

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index d00af43..bbed01e 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -14,7 +14,7 @@ development:
   assets.compress: false
   assets.debug: true
   profiling_enabled: true
-  site_name: Workbench:dev
+  site_name: Arvados Workbench (dev)
 
 production:
   force_ssl: true
diff --git a/apps/workbench/config/environments/development.rb.example b/apps/workbench/config/environments/development.rb.example
index ba3dbbe..389a254 100644
--- a/apps/workbench/config/environments/development.rb.example
+++ b/apps/workbench/config/environments/development.rb.example
@@ -35,24 +35,4 @@ ArvadosWorkbench::Application.configure do
   # Expands the lines which load the assets
   config.assets.debug = true
 
-  # Log timing data for API transactions
-  config.profiling_enabled = true
-
-  config.arvados_login_base = 'http://arvados.local/login'
-  config.arvados_v1_base = 'http://arvados.local/arvados/v1'
-  config.arvados_insecure_https = true # true = do not check server certificate
-
-  config.data_import_dir = '/tmp/arvados-workbench-upload'
-  config.data_export_dir = '/tmp/arvados-workbench-download'
-
-  config.secret_token = File.read('config/.secret_token') if File.exist? 'config/.secret_token'
-
-  config.site_name = 'Arvados Workbench (dev)'
-  config.activation_contact_link = 'mailto:info at arvados.org'
-
-  config.arvados_docsite = 'http://doc.arvados.org'
-
-  config.arvados_theme = 'default'
-
-  config.show_user_agreement_inline = false
 end
diff --git a/apps/workbench/config/environments/production.rb.example b/apps/workbench/config/environments/production.rb.example
index 2b4a39f..bb75954 100644
--- a/apps/workbench/config/environments/production.rb.example
+++ b/apps/workbench/config/environments/production.rb.example
@@ -68,23 +68,4 @@ ArvadosWorkbench::Application.configure do
   # Log timing data for API transactions
   config.profiling_enabled = false
 
-  config.arvados_login_base = 'https://arvados.local/login'
-  config.arvados_v1_base = 'https://arvados.local/arvados/v1'
-  config.arvados_insecure_https = false # true = do not check server certificate
-
-  config.data_import_dir = '/data/arvados-workbench-upload/data'
-  config.data_export_dir = '/data/arvados-workbench-download/data'
-
-  # Authentication stub: hard code pre-approved API tokens.
-  # config.accept_api_token = { rand(2**256).to_s(36) => true }
-  config.accept_api_token = {}
-
-  config.site_name = 'Arvados Workbench'
-  config.activation_contact_link = 'mailto:info at arvados.org'
-
-  config.arvados_docsite = 'http://doc.arvados.org'
-
-  config.arvados_theme = 'default'
-
-  config.show_user_agreement_inline = false
 end
diff --git a/apps/workbench/config/environments/test.rb.example b/apps/workbench/config/environments/test.rb.example
index c4a5d22..b3cb72a 100644
--- a/apps/workbench/config/environments/test.rb.example
+++ b/apps/workbench/config/environments/test.rb.example
@@ -38,23 +38,4 @@ ArvadosWorkbench::Application.configure do
   # Log timing data for API transactions
   config.profiling_enabled = false
 
-  config.arvados_login_base = 'http://arvados.local/login'
-  config.arvados_v1_base = 'https://arvados.local/arvados/v1'
-  config.arvados_insecure_https = true # true = do not check server certificate
-
-  config.data_import_dir = '/data/arvados-workbench-upload'
-  config.data_export_dir = '/data/arvados-workbench-download'
-
-  # Authentication stub: hard code pre-approved API tokens.
-  # config.accept_api_token = { rand(2**256).to_s(36) => true }
-  config.accept_api_token = {}
-
-  config.site_name = 'Arvados Workbench (test)'
-  config.activation_contact_link = 'mailto:info at arvados.org'
-
-  config.arvados_docsite = 'http://doc.arvados.org'
-
-  config.arvados_theme = 'default'
-
-  config.show_user_agreement_inline = false
 end

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


hooks/post-receive
--