[ARVADOS] updated: 2c2815886a796d657f76312c6f6223146956ed9a
git at public.curoverse.com
git at public.curoverse.com
Mon Mar 10 16:06:37 EDT 2014
Summary of changes:
apps/workbench/.gitignore | 2 +-
apps/workbench/app/views/users/_tables.html.erb | 2 +-
...config.defaults.yml => application.default.yml} | 2 +-
...{config.yml.example => application.yml.example} | 12 ++--
apps/workbench/config/initializers/load_config.rb | 6 +-
doc/_config.yml | 2 +-
doc/_includes/_parallel_hash_script_py.liquid | 2 +-
.../ApiClientAuthorization.html.textile.liquid | 2 +-
doc/api/schema/AuthorizedKey.html.textile.liquid | 2 +-
doc/api/schema/Commit.html.textile.liquid | 2 +-
doc/api/schema/CommitAncestor.html.textile.liquid | 2 +-
doc/api/schema/Group.html.textile.liquid | 2 +-
doc/api/schema/Human.html.textile.liquid | 2 +-
doc/api/schema/KeepDisk.html.textile.liquid | 2 +-
doc/api/schema/Log.html.textile.liquid | 2 +-
doc/api/schema/Node.html.textile.liquid | 2 +-
.../schema/PipelineInstance.html.textile.liquid | 2 +-
.../schema/PipelineTemplate.html.textile.liquid | 2 +-
doc/api/schema/Repository.html.textile.liquid | 2 +-
doc/api/schema/Specimen.html.textile.liquid | 2 +-
doc/api/schema/Trait.html.textile.liquid | 2 +-
doc/api/schema/User.html.textile.liquid | 2 +-
doc/api/schema/VirtualMachine.html.textile.liquid | 2 +-
doc/user/reference/sdk-cli.html.textile.liquid | 4 +-
.../tutorial-firstscript.html.textile.liquid | 5 +
...rial-gatk-variantfiltration.html.textile.liquid | 2 +-
.../tutorials/tutorial-job1.html.textile.liquid | 2 +-
.../tutorial-new-pipeline.html.textile.liquid | 4 +-
.../tutorial-parallel.html.textile.liquid | 3 +
sdk/python/arvados/collection.py | 7 +-
sdk/python/arvados/errors.py | 2 +
sdk/python/setup.py.src | 1 +
sdk/python/test_collections.py | 2 +-
services/api/.gitignore | 2 +-
services/api/app/models/blob.rb | 96 ++++++++++++++++++++
...config.defaults.yml => application.default.yml} | 4 +-
...{config.yml.example => application.yml.example} | 12 ++--
services/api/config/initializers/load_config.rb | 5 +-
services/api/script/crunch-dispatch.rb | 11 ++-
services/api/test/unit/blob_test.rb | 94 +++++++++++++++++++
40 files changed, 263 insertions(+), 53 deletions(-)
rename apps/workbench/config/{config.defaults.yml => application.default.yml} (97%)
rename apps/workbench/config/{config.yml.example => application.yml.example} (51%)
create mode 100644 services/api/app/models/blob.rb
rename services/api/config/{config.defaults.yml => application.default.yml} (95%)
rename services/api/config/{config.yml.example => application.yml.example} (66%)
create mode 100644 services/api/test/unit/blob_test.rb
via 2c2815886a796d657f76312c6f6223146956ed9a (commit)
via 0b9dce85589ac5f259c8bf6cc30b23d5f99e2b97 (commit)
via 110b52c3e76c874c0e6216950f93ab5539143017 (commit)
via 890477eb5544437c339a7461fbf8e8f04020581b (commit)
via 27f9168d85ec178f440f683c19a4fec7ddc2ceda (commit)
via e46ae4015db8f166359515f2e9823ac1a2c7cab8 (commit)
via 74c3346a12b71f8c85e4fae6c390a9e374bc39a8 (commit)
via dc97d8812b5f793c50e15b60fae66464690b9b41 (commit)
via db6cfb21fd49c09d46aca5b1e340125d0765812c (commit)
via 62944c5d504765d57756c133cfb17186ca66eda5 (commit)
via 51f56533f4a1dd871551c4c85720a435b874c87f (commit)
via 2133a90a7c31358a025a4ce68385a38954750c3f (commit)
via f569984ab4f48b393901fe3295218e576e81b9eb (commit)
via cad44d1dbfdd2cbadba521a88c0817b144dd1d6b (commit)
via 63511ce5f1dc6d6e38cfafe240f0c907ad11748e (commit)
from 551fad0465af5ee41b091d3ea76f7c2ade1a4386 (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 2c2815886a796d657f76312c6f6223146956ed9a
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Mar 10 16:05:31 2014 -0400
Rename config[.defaults].yml to application[.default].yml
diff --git a/apps/workbench/.gitignore b/apps/workbench/.gitignore
index 1c551bc..a656a5b 100644
--- a/apps/workbench/.gitignore
+++ b/apps/workbench/.gitignore
@@ -22,7 +22,7 @@
/config/environments/development.rb
/config/environments/test.rb
/config/environments/production.rb
-/config/config.yml
+/config/application.yml
/config/piwik.yml
diff --git a/apps/workbench/config/config.defaults.yml b/apps/workbench/config/application.default.yml
similarity index 97%
rename from apps/workbench/config/config.defaults.yml
rename to apps/workbench/config/application.default.yml
index 9394943..790c1f7 100644
--- a/apps/workbench/config/config.defaults.yml
+++ b/apps/workbench/config/application.default.yml
@@ -1,5 +1,5 @@
# Do not use this file for site configuration. Create config.yml
-# instead (see config.yml.example).
+# instead (see application.yml.example).
development:
cache_classes: false
diff --git a/apps/workbench/config/config.yml.example b/apps/workbench/config/application.yml.example
similarity index 51%
rename from apps/workbench/config/config.yml.example
rename to apps/workbench/config/application.yml.example
index 45c8a28..395f1a9 100644
--- a/apps/workbench/config/config.yml.example
+++ b/apps/workbench/config/application.yml.example
@@ -1,14 +1,14 @@
-# Copy this file to config.yml and edit to suit.
+# Copy this file to application.yml and edit to suit.
#
-# Consult config.defaults.yml for the full list of configuration
+# Consult application.default.yml for the full list of configuration
# settings.
#
# The order of precedence is:
# 1. config/environments/{RAILS_ENV}.rb (deprecated)
-# 2. Section in config.yml corresponding to RAILS_ENV (e.g., development)
-# 3. Section in config.yml called "common"
-# 4. Section in config.defaults.yml corresponding to RAILS_ENV
-# 5. Section in config.defaults.yml called "common"
+# 2. Section in application.yml corresponding to RAILS_ENV (e.g., development)
+# 3. Section in application.yml called "common"
+# 4. Section in application.default.yml corresponding to RAILS_ENV
+# 5. Section in application.default.yml called "common"
common:
# At minimum, you need a nice long randomly generated secret_token here.
diff --git a/apps/workbench/config/initializers/load_config.rb b/apps/workbench/config/initializers/load_config.rb
index 90ddbde..43711fc 100644
--- a/apps/workbench/config/initializers/load_config.rb
+++ b/apps/workbench/config/initializers/load_config.rb
@@ -1,5 +1,6 @@
$application_config = {}
-%w(config.defaults config).each do |cfgfile|
+
+%w(application.default application).each do |cfgfile|
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
if File.exists? path
yaml = ERB.new(IO.read path).result(binding)
@@ -36,7 +37,8 @@ ArvadosWorkbench::Application.configure do
raise <<EOS
Refusing to start in #{::Rails.env.to_s} mode with missing configuration.
-The following configuration settings must be specified in config/config.yml:
+The following configuration settings must be specified in
+config/application.yml:
* #{nils.join "\n* "}
EOS
diff --git a/services/api/.gitignore b/services/api/.gitignore
index 0e95cf8..6ddf523 100644
--- a/services/api/.gitignore
+++ b/services/api/.gitignore
@@ -18,7 +18,7 @@
/config/api.clinicalfuture.com.*
/config/database.yml
/config/initializers/omniauth.rb
-/config/config.yml
+/config/application.yml
# asset cache
/public/assets/
diff --git a/services/api/config/config.defaults.yml b/services/api/config/application.default.yml
similarity index 95%
rename from services/api/config/config.defaults.yml
rename to services/api/config/application.default.yml
index 8b454ea..c8ad012 100644
--- a/services/api/config/config.defaults.yml
+++ b/services/api/config/application.default.yml
@@ -1,5 +1,5 @@
-# Do not use this file for site configuration. Create config.yml
-# instead (see config.yml.example).
+# Do not use this file for site configuration. Create application.yml
+# instead (see application.yml.example).
development:
force_ssl: false
diff --git a/services/api/config/config.yml.example b/services/api/config/application.yml.example
similarity index 66%
rename from services/api/config/config.yml.example
rename to services/api/config/application.yml.example
index 15f2be3..3035c8b 100644
--- a/services/api/config/config.yml.example
+++ b/services/api/config/application.yml.example
@@ -1,14 +1,14 @@
-# Copy this file to config.yml and edit to suit.
+# Copy this file to application.yml and edit to suit.
#
-# Consult config.defaults.yml for the full list of configuration
+# Consult application.default.yml for the full list of configuration
# settings.
#
# The order of precedence is:
# 1. config/environments/{RAILS_ENV}.rb (deprecated)
-# 2. Section in config.yml corresponding to RAILS_ENV (e.g., development)
-# 3. Section in config.yml called "common"
-# 4. Section in config.defaults.yml corresponding to RAILS_ENV
-# 5. Section in config.defaults.yml called "common"
+# 2. Section in application.yml corresponding to RAILS_ENV (e.g., development)
+# 3. Section in application.yml called "common"
+# 4. Section in application.default.yml corresponding to RAILS_ENV
+# 5. Section in application.default.yml called "common"
development:
diff --git a/services/api/config/initializers/load_config.rb b/services/api/config/initializers/load_config.rb
index 954ab48..3399fd9 100644
--- a/services/api/config/initializers/load_config.rb
+++ b/services/api/config/initializers/load_config.rb
@@ -1,6 +1,6 @@
$application_config = {}
-%w(config.defaults config).each do |cfgfile|
+%w(application.default application).each do |cfgfile|
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
if File.exists? path
yaml = ERB.new(IO.read path).result(binding)
@@ -37,7 +37,8 @@ Server::Application.configure do
raise <<EOS
Refusing to start in #{::Rails.env.to_s} mode with missing configuration.
-The following configuration settings must be specified in config/config.yml:
+The following configuration settings must be specified in
+config/application.yml:
* #{nils.join "\n* "}
EOS
commit 0b9dce85589ac5f259c8bf6cc30b23d5f99e2b97
Merge: 551fad0 110b52c
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Mar 10 15:58:49 2014 -0400
Merge branch 'master' into 2076-check-config-at-boot
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list