Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonne Haß <me@mrzyx.de>2012-11-30 21:16:23 +0400
committerJonne Haß <me@mrzyx.de>2012-11-30 21:16:56 +0400
commitbf27cca03a516cf127d18d81171096909792418c (patch)
tree5205415d111f4c1736ba1903f26196941d981060 /config/environment.rb
parent2a7a0b7b990b70835e336ddffe62bf0e4b198ac4 (diff)
Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead.
Diffstat (limited to 'config/environment.rb')
-rw-r--r--config/environment.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environment.rb b/config/environment.rb
index 07256b9f7..57ad7ff2e 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -12,7 +12,7 @@ def sqlite?
end
# Load the rails application
-require File.expand_path('../application', __FILE__)
+require Pathname.new(__FILE__).dirname.expand_path.join('application')
require Rails.root.join("lib", "exceptions")
# Load configuration system early