aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-03-02 13:48:45 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-03-02 13:48:45 -0300
commited6be5962420e75a60ccc32c3fdf575f1c14ff9a (patch)
tree00581ab84b65309f8860c1fcd8875374a657151d /railties/lib
parent521318333eaa2654b9ad535c592281ae9efb9113 (diff)
parent562b0b23684333be8766dc73c419f7b753933626 (diff)
downloadrails-ed6be5962420e75a60ccc32c3fdf575f1c14ff9a.tar.gz
rails-ed6be5962420e75a60ccc32c3fdf575f1c14ff9a.tar.bz2
rails-ed6be5962420e75a60ccc32c3fdf575f1c14ff9a.zip
Merge pull request #19173 from robin850/rbx-build
Improve the Rubinius build
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/ruby_version_check.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb
index aea3d2339c..e2a199ec4d 100644
--- a/railties/lib/rails/ruby_version_check.rb
+++ b/railties/lib/rails/ruby_version_check.rb
@@ -1,4 +1,4 @@
-if RUBY_VERSION < '2.2.0'
+if RUBY_VERSION < '2.2.0' && RUBY_ENGINE == 'ruby'
desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
abort <<-end_message