aboutsummaryrefslogtreecommitdiffstats
path: root/config/boot.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-06-12 09:20:43 +0100
committerSeb Bacon <seb.bacon@gmail.com>2012-06-12 09:20:43 +0100
commit54fc48b9b66ce29f660064fbea3e71ea15b61d58 (patch)
tree85269b9ef4f62bce2393134981edf30adf370b05 /config/boot.rb
parentdc14834a5d85032645f3a410faae68089fb5fe1a (diff)
parent04653b52f2233c9b4fea6b690d16a825b974d36d (diff)
Merge branch 'release/0.6' of github.com:sebbacon/alaveteli into release/0.6
Diffstat (limited to 'config/boot.rb')
-rw-r--r--config/boot.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/boot.rb b/config/boot.rb
index 943029408..906a2bace 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -6,7 +6,7 @@
# better. Look for a config/rails_env file, and read stuff from there if
# it exists. Put just a line like this in there:
# ENV['RAILS_ENV'] = 'production'
-rails_env_file = File.join(File.dirname(__FILE__), 'rails_env.rb')
+rails_env_file = File.expand_path(File.join(File.dirname(__FILE__), 'rails_env.rb'))
if File.exists?(rails_env_file)
require rails_env_file
end