projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7167-keep-rsync-test-setup' into 7167-keep-rsync
[arvados.git]
/
services
/
api
/
config
/
application.default.yml
diff --git
a/services/api/config/application.default.yml
b/services/api/config/application.default.yml
index 51bc4f98f3b89f47e9dbb0f669a5a458f0fc6a55..8777f28a86000ee9ccef86f15bd75e8160c2c3bd 100644
(file)
--- a/
services/api/config/application.default.yml
+++ b/
services/api/config/application.default.yml
@@
-326,9
+326,11
@@
common:
default_openid_prefix: https://www.google.com/accounts/o8/id
default_openid_prefix: https://www.google.com/accounts/o8/id
- # source_version
- source_version: "<%= `git log -n 1 --format=%h`.strip %>"
- local_modified: false
+ # Override the automatic version string. With the default value of
+ # false, the version string is read from git-commit.version in
+ # Rails.root (included in vendor packages) or determined by invoking
+ # "git log".
+ source_version: false
development:
development:
@@
-345,7
+347,6
@@
development:
active_record.auto_explain_threshold_in_seconds: 0.5
assets.compress: false
assets.debug: true
active_record.auto_explain_threshold_in_seconds: 0.5
assets.compress: false
assets.debug: true
- local_modified: "<%= '-modified' if `git status -s` != '' %>"
production:
force_ssl: true
production:
force_ssl: true