From c12d4e4ea0291fc16d6cd2db4cfdc4630f6e61d0 Mon Sep 17 00:00:00 2001 From: robertomiranda Date: Sat, 23 Mar 2013 22:22:37 -0500 Subject: [PATCH 1/2] Ignore Ruby Version --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0a55837d..94d39f3b 100644 --- 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 From 15b0e68677145906e791c140cff014f43c7bc45d Mon Sep 17 00:00:00 2001 From: robertomiranda Date: Sat, 23 Mar 2013 22:23:11 -0500 Subject: [PATCH 2/2] Add #to_s method to rails version --- lib/jquery/rails.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jquery/rails.rb b/lib/jquery/rails.rb index 13ea0861..901b7f2c 100644 --- 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'