projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7709: Merge branch 'master' into 7709-api-rails4
[arvados.git]
/
services
/
api
/
config
/
initializers
/
load_config.rb
diff --git
a/services/api/config/initializers/load_config.rb
b/services/api/config/initializers/load_config.rb
index 76234d3e4b0f6ab148f73cb7a1242af1eacefb6a..787469cca3abd9ad51cb438c1e223fccaf873370 100644
(file)
--- a/
services/api/config/initializers/load_config.rb
+++ b/
services/api/config/initializers/load_config.rb
@@
-6,7
+6,7
@@
rescue LoadError
# configured by application.yml (i.e., here!) instead.
end
# configured by application.yml (i.e., here!) instead.
end
-if (File.exist
s
?(File.expand_path '../omniauth.rb', __FILE__) and
+if (File.exist?(File.expand_path '../omniauth.rb', __FILE__) and
not defined? WARNED_OMNIAUTH_CONFIG)
Rails.logger.warn <<-EOS
DEPRECATED CONFIGURATION:
not defined? WARNED_OMNIAUTH_CONFIG)
Rails.logger.warn <<-EOS
DEPRECATED CONFIGURATION:
@@
-26,7
+26,7
@@
$application_config = {}
%w(application.default application).each do |cfgfile|
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
%w(application.default application).each do |cfgfile|
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
- if File.exist
s
? path
+ if File.exist? path
yaml = ERB.new(IO.read path).result(binding)
confs = YAML.load(yaml, deserialize_symbols: true)
# Ignore empty YAML file:
yaml = ERB.new(IO.read path).result(binding)
confs = YAML.load(yaml, deserialize_symbols: true)
# Ignore empty YAML file:
@@
-69,4
+69,5
@@
config/application.yml:
EOS
end
EOS
end
+ config.secret_key_base = config.secret_token
end
end