From 1b15bc73b17251509fb13de8cc64f404de23bdb1 Mon Sep 17 00:00:00 2001 From: echarp Date: Fri, 26 Feb 2016 23:16:56 +0100 Subject: [PATCH] Going back to jquery rails before 4.1, to correct the date picker --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 38b836c2..2bb474fd 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,7 @@ group :development, :test, :assets do gem 'coffee-rails' # Use jquery as the JavaScript library - gem 'jquery-rails' + gem 'jquery-rails', '< 4.1' # Turbolinks makes following links in your web application # faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' diff --git a/Gemfile.lock b/Gemfile.lock index cd7b15f7..6bf2a7a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,7 +229,7 @@ GEM jbuilder (2.4.1) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-rails (4.1.0) + jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -464,7 +464,7 @@ DEPENDENCIES http_accept_language i18n-active_record! jbuilder - jquery-rails + jquery-rails (< 4.1) jquery-sparkline-rails! jquery-turbolinks leaflet-markercluster-rails