aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG3
-rw-r--r--railties/environments/boot.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 202aa45a61..e0d3b5df58 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,3 +1,6 @@
+* Remove trailing '/' from RAILS_ROOT [Nicholas Seckar]
+
+
*0.14.0* (October 16th, 2005)
* Moved generator folder from RAILS_ROOT/generators to RAILS_ROOT/lib/generators [Tobias Luetke]
diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb
index 9e35fb6c15..9715482cfc 100644
--- a/railties/environments/boot.rb
+++ b/railties/environments/boot.rb
@@ -1,7 +1,7 @@
unless defined?(RAILS_ROOT)
require 'pathname'
root_path = Pathname.new(File.join(File.dirname(__FILE__), '..'))
- RAILS_ROOT = root_path.cleanpath.to_s + '/'
+ RAILS_ROOT = root_path.cleanpath.to_s
end
if File.directory?("#{RAILS_ROOT}/vendor/rails")