aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/engine.rb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-04-13 14:07:46 -0700
committerwycats <wycats@gmail.com>2010-04-13 14:07:46 -0700
commit8e9df34fa3fd22719d939ba72f19b3ae9ffcc018 (patch)
treefb7d56ee45fcf33ac78f6591e1fcd8d8de3a54c4 /railties/lib/rails/engine.rb
parentdc251389d1ab4303b80a22642f4241940b73cbe7 (diff)
parentb4fd5e6f1a00b7c2b482de3d3b99a27adeba5920 (diff)
downloadrails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.gz
rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.bz2
rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/engine.rb')
-rw-r--r--railties/lib/rails/engine.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index c284840a38..0f33b40a13 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -119,7 +119,7 @@ module Rails
root = File.exist?("#{root_path}/#{flag}") ? root_path : default
raise "Could not find root path for #{self}" unless root
- RUBY_PLATFORM =~ /(:?mswin|mingw)/ ?
+ RUBY_PLATFORM =~ /mswin|mingw/ ?
Pathname.new(root).expand_path : Pathname.new(root).realpath
end
end