From 1fd156fd4678f07bae397ce9b270f6c082d12f95 Mon Sep 17 00:00:00 2001 From: Fabian Rodriguez Date: Sat, 4 Jan 2014 17:58:11 -0200 Subject: [PATCH] bump jquery-rails to 3.0.4 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 46d258f58..7bea2a253 100644 --- a/Gemfile +++ b/Gemfile @@ -129,7 +129,7 @@ group :assets do gem 'backbone-on-rails', '1.1.0' gem 'handlebars_assets', '0.12.0' - gem 'jquery-rails', '2.1.4' + gem 'jquery-rails', '3.0.4' # Windows and OSX have an execjs compatible runtime built-in, Linux users should # install Node.js or use 'therubyracer'. diff --git a/Gemfile.lock b/Gemfile.lock index d41e85957..3847db4aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,7 +206,7 @@ GEM selenium-webdriver (>= 0.1.3) jasmine-core (1.3.1) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (3.0.1) @@ -487,7 +487,7 @@ DEPENDENCIES http_accept_language (= 1.0.2) i18n-inflector-rails (= 1.0.7) jasmine (= 1.3.2) - jquery-rails (= 2.1.4) + jquery-rails (= 3.0.4) json (= 1.8.1) markerb (= 1.0.1) messagebus_ruby_api (= 1.0.3)