Merge pull request rails#117 from robertomiranda/version-to-s

Add #to_s method to rails version
masterkain · Mar 24, 2013 · b546434 · b546434
2 parents 7c0ee2b + 15b0e68
commit b546434
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@ pkg/*
 tmp
 spec/support/*/Gemfile.lock
 spec/support/*/public/javascripts
-.rvmrc
+.ruby-version
 .bundle
 imports/*
 Gemfile.lock
diff --git a/lib/jquery/rails.rb b/lib/jquery/rails.rb
@@ -1,5 +1,5 @@
 require 'jquery/assert_select' if ::Rails.env.test?
-require 'jquery/rails/engine' if ::Rails.version >= '3.1'
+require 'jquery/rails/engine' if ::Rails.version.to_s >= '3.1'
 require 'jquery/rails/railtie'
 require 'jquery/rails/version'