Merge branch 'master' into HEAD

[rails.git] / config / initializers / banners.rb

diff --git a/config/initializers/banners.rb b/config/initializers/banners.rb
index 5409f45313d8e5dd5807fcc1a9a5983739d354c4..c7ff281f30d721f2c31263bbbdeb703e01417d44 100644 (file)
--- a/config/initializers/banners.rb
+++ b/config/initializers/banners.rb
@@ -1 +1,5 @@
-BANNERS = YAML.load_file("#{Rails.root}/config/banners.yml").deep_symbolize_keys rescue {}
+begin
+  BANNERS = YAML.load_file(Rails.root.join("config/banners.yml")).deep_symbolize_keys
+rescue StandardError
+  BANNERS = {}.freeze
+end