Skip to content

Commit

Permalink
awesomefoundation#269 resolving issue with date selector
Browse files Browse the repository at this point in the history
formtastic/formtastic#1226 (affected simple_form too on this version of rails)
  • Loading branch information
divideby0 committed Jul 7, 2017
1 parent 47d92de commit b03cf0c
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 32 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
63 changes: 32 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@ 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)
rack (~> 1.4.5)
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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -264,30 +264,30 @@ 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
rack-ssl (1.3.4)
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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b03cf0c

Please sign in to comment.