From b03cf0c600cede8db41c399cded84e89d68e47cf Mon Sep 17 00:00:00 2001 From: Cedric Hurst Date: Thu, 6 Jul 2017 21:02:21 -0500 Subject: [PATCH] #269 resolving issue with date selector https://github.com/justinfrench/formtastic/issues/1226 (affected simple_form too on this version of rails) --- Gemfile | 3 ++- Gemfile.lock | 63 ++++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Gemfile b/Gemfile index 7253fb14..99e12507 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,8 @@ source 'http://rubygems.org' ruby '2.1.7' -gem 'rails', '3.2.22.3' +gem 'rails', '3.2.22.4' +gem 'rake', '< 11.0' # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index 89ae74dc..67ec8047 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: http://rubygems.org/ specs: CFPropertyList (2.3.1) - actionmailer (3.2.22.3) - actionpack (= 3.2.22.3) + actionmailer (3.2.22.4) + actionpack (= 3.2.22.4) mail (~> 2.5.4) - actionpack (3.2.22.3) - activemodel (= 3.2.22.3) - activesupport (= 3.2.22.3) + actionpack (3.2.22.4) + activemodel (= 3.2.22.4) + activesupport (= 3.2.22.4) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -15,18 +15,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.22.3) - activesupport (= 3.2.22.3) + activemodel (3.2.22.4) + activesupport (= 3.2.22.4) builder (~> 3.0.0) - activerecord (3.2.22.3) - activemodel (= 3.2.22.3) - activesupport (= 3.2.22.3) + activerecord (3.2.22.4) + activemodel (= 3.2.22.4) + activesupport (= 3.2.22.4) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.22.3) - activemodel (= 3.2.22.3) - activesupport (= 3.2.22.3) - activesupport (3.2.22.3) + activeresource (3.2.22.4) + activemodel (= 3.2.22.4) + activesupport (= 3.2.22.4) + activesupport (3.2.22.4) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.2.8) @@ -213,7 +213,7 @@ GEM httparty (0.8.3) multi_json (~> 1.0) multi_xml - i18n (0.7.0) + i18n (0.8.4) inflecto (0.0.2) ipaddress (0.8.0) journey (1.0.4) @@ -223,12 +223,12 @@ GEM jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.8.3) + json (1.8.6) json_pure (1.8.1) launchy (2.1.0) addressable (~> 2.2.6) magnific-popup-rails (0.9.9.1) - mail (2.5.4) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) @@ -264,7 +264,7 @@ GEM rack (1.4.7) rack-attack (4.3.1) rack - rack-cache (1.6.1) + rack-cache (1.7.0) rack (>= 0.4) rack-protection (1.5.3) rack @@ -272,22 +272,22 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (3.2.22.3) - actionmailer (= 3.2.22.3) - actionpack (= 3.2.22.3) - activerecord (= 3.2.22.3) - activeresource (= 3.2.22.3) - activesupport (= 3.2.22.3) + rails (3.2.22.4) + actionmailer (= 3.2.22.4) + actionpack (= 3.2.22.4) + activerecord (= 3.2.22.4) + activeresource (= 3.2.22.4) + activesupport (= 3.2.22.4) bundler (~> 1.0) - railties (= 3.2.22.3) + railties (= 3.2.22.4) rails_12factor (0.0.2) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.2) rails_stdout_logging (0.0.3) - railties (3.2.22.3) - actionpack (= 3.2.22.3) - activesupport (= 3.2.22.3) + railties (3.2.22.4) + actionpack (= 3.2.22.4) + activesupport (= 3.2.22.4) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -361,7 +361,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.19.1) + thor (0.19.4) tilt (1.4.1) timecop (0.3.5) timers (1.1.0) @@ -371,7 +371,7 @@ GEM turnip (1.2.2) gherkin (>= 2.5) rspec (>= 2.0, < 4.0) - tzinfo (0.3.51) + tzinfo (0.3.53) uglifier (1.2.4) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -417,8 +417,9 @@ DEPENDENCIES pry pry-nav rack-attack - rails (= 3.2.22.3) + rails (= 3.2.22.4) rails_12factor + rake (< 11.0) redcarpet rollbar rspec-rails