[ARVADOS] updated: 7c8f8fda0c43bc379995ebb0204112eccfb6d97d

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/application.default.yml |   10 +++++++++-
 apps/workbench/config/application.yml.example |    8 --------
 2 files changed, 9 insertions(+), 9 deletions(-)

       via  7c8f8fda0c43bc379995ebb0204112eccfb6d97d (commit)
       via  49016b4c5681cf819b3e42370e6e65c254cde4b4 (commit)
      from  95e59f8e8c427bf199445a75102f1dfaeb4bf8a6 (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 7c8f8fda0c43bc379995ebb0204112eccfb6d97d
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Mar 20 17:26:48 2014 -0400

    workbench: Fix typo in application.default.yml.

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index a346af5..d00af43 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -1,4 +1,4 @@
-# Do not use this file for site configuration. Create config.yml
+# Do not use this file for site configuration. Create application.yml
 # instead (see application.yml.example).
 
 development:

commit 49016b4c5681cf819b3e42370e6e65c254cde4b4
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Mar 20 17:24:24 2014 -0400

    workbench: Make integration test settings default.
    
    We know that these settings should work out of the box, given the
    settings in the API server's `rails` script.  Making them the default
    makes it easier to get the tests running.

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 1392552..a346af5 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -51,6 +51,14 @@ test:
   profiling_enabled: false
   secret_token: <%= rand(2**256).to_s(36) %>
 
+  # When you run the Workbench's integration tests, it starts the API
+  # server as a dependency.  These settings should match the API
+  # server's Rails defaults.  If you adjust those, change these
+  # settings in application.yml to match.
+  arvados_login_base: https://localhost:3001/login
+  arvados_v1_base: https://localhost:3001/arvados/v1
+  arvados_insecure_https: true
+
   site_name: Workbench:test
 
 common:
diff --git a/apps/workbench/config/application.yml.example b/apps/workbench/config/application.yml.example
index 5db52ed..395f1a9 100644
--- a/apps/workbench/config/application.yml.example
+++ b/apps/workbench/config/application.yml.example
@@ -18,11 +18,3 @@ common:
   arvados_login_base: https://arvados.local:3000/login
   arvados_v1_base: https://arvados.local:3000/arvados/v1
   arvados_insecure_https: true
-
-test:
-  # When you run the Workbench's integration tests, it starts the API server
-  # as a dependency.  These settings should match the API server's Rails
-  # defaults.  If you adjust those, change these settings to match.
-  arvados_login_base: https://localhost:3001/login
-  arvados_v1_base: https://localhost:3001/arvados/v1
-  arvados_insecure_https: true

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


hooks/post-receive
--