From c71e96b90123c9be1f8835314893b373ffd09d0f Mon Sep 17 00:00:00 2001 From: Uday Kadaboina Date: Mon, 3 Feb 2014 19:49:59 -0500 Subject: Upgraded jquery-rails gem version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 88f3686e95..d1eb460fbc 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' gem 'bcrypt-ruby', '~> 3.1.2' -gem 'jquery-rails', '~> 2.2.0' +gem 'jquery-rails', '~> 3.1.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0' -- cgit v1.2.3 From af66c4697c2ca3d67c853cae6c900b124c354e90 Mon Sep 17 00:00:00 2001 From: Erik Michaels-Ober Date: Wed, 12 Feb 2014 12:55:47 +0100 Subject: Update Travis settings for Rubinius /cc @brixen --- Gemfile | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d1eb460fbc..753b1d423a 100644 --- a/Gemfile +++ b/Gemfile @@ -76,11 +76,6 @@ platforms :jruby do end end -platforms :rbx do - gem 'psych', '~> 2.0' - gem 'rubysl', '~> 2.0' -end - # gems that are necessary for ActiveRecord tests with Oracle database if ENV['ORACLE_ENHANCED'] platforms :ruby do -- cgit v1.2.3