diff --git a/Gemfile b/Gemfile index d57395dd..3585c665 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ def darwin_only(require_as) RbConfig::CONFIG['host_os'] =~ /darwin/ ? require_as : false end -gem 'rails', '4.2.1' +gem 'rails', '4.2.2' gem 'haml', '4.0.6' gem 'will_paginate', '3.0.7' gem 'formtastic', '3.1.3' diff --git a/Gemfile.lock b/Gemfile.lock index d5519349..447968cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,36 +10,36 @@ GEM remote: http://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) + actionmailer (4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.1) - actionview (= 4.2.1) - activesupport (= 4.2.1) + actionpack (4.2.2) + actionview (= 4.2.2) + activesupport (= 4.2.2) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.1) - activesupport (= 4.2.1) + actionview (4.2.2) + activesupport (= 4.2.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.1) - activesupport (= 4.2.1) + activejob (4.2.2) + activesupport (= 4.2.2) globalid (>= 0.3.0) - activemodel (4.2.1) - activesupport (= 4.2.1) + activemodel (4.2.2) + activesupport (= 4.2.2) builder (~> 3.1) - activerecord (4.2.1) - activemodel (= 4.2.1) - activesupport (= 4.2.1) + activerecord (4.2.2) + activemodel (= 4.2.2) + activesupport (= 4.2.2) arel (~> 6.0) - activesupport (4.2.1) + activesupport (4.2.2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -165,7 +165,7 @@ GEM tilt hitimes (1.2.2) i18n (0.7.0) - jquery-rails (4.0.3) + jquery-rails (4.0.4) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -182,7 +182,7 @@ GEM launchy (2.4.3) addressable (~> 2.3) libv8 (3.16.14.7) - listen (2.10.0) + listen (2.10.1) celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -228,19 +228,19 @@ GEM slop (~> 3.4) pry-rails (0.3.4) pry (>= 0.9.10) - rack (1.6.1) + rack (1.6.2) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.1) - actionmailer (= 4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) - activemodel (= 4.2.1) - activerecord (= 4.2.1) - activesupport (= 4.2.1) + rails (4.2.2) + actionmailer (= 4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) + activemodel (= 4.2.2) + activerecord (= 4.2.2) + activesupport (= 4.2.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1) + railties (= 4.2.2) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -250,9 +250,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) - railties (4.2.1) - actionpack (= 4.2.1) - activesupport (= 4.2.1) + railties (4.2.2) + actionpack (= 4.2.2) + activesupport (= 4.2.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -349,7 +349,7 @@ GEM activerecord warden (1.2.3) rack (>= 1.0) - web-console (2.1.2) + web-console (2.1.3) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) @@ -404,7 +404,7 @@ DEPENDENCIES newrelic_rpm poltergeist pry-rails - rails (= 4.2.1) + rails (= 4.2.2) rb-fsevent rb-inotify rspec-collection_matchers diff --git a/vendor/cache/actionmailer-4.2.1.gem b/vendor/cache/actionmailer-4.2.1.gem deleted file mode 100644 index 6643d819..00000000 Binary files a/vendor/cache/actionmailer-4.2.1.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-4.2.2.gem b/vendor/cache/actionmailer-4.2.2.gem new file mode 100644 index 00000000..da4f343a Binary files /dev/null and b/vendor/cache/actionmailer-4.2.2.gem differ diff --git a/vendor/cache/actionpack-4.2.1.gem b/vendor/cache/actionpack-4.2.1.gem deleted file mode 100644 index 999ad528..00000000 Binary files a/vendor/cache/actionpack-4.2.1.gem and /dev/null differ diff --git a/vendor/cache/actionpack-4.2.2.gem b/vendor/cache/actionpack-4.2.2.gem new file mode 100644 index 00000000..d38c668d Binary files /dev/null and b/vendor/cache/actionpack-4.2.2.gem differ diff --git a/vendor/cache/actionview-4.2.1.gem b/vendor/cache/actionview-4.2.1.gem deleted file mode 100644 index a420d6ca..00000000 Binary files a/vendor/cache/actionview-4.2.1.gem and /dev/null differ diff --git a/vendor/cache/actionview-4.2.2.gem b/vendor/cache/actionview-4.2.2.gem new file mode 100644 index 00000000..8a645f1b Binary files /dev/null and b/vendor/cache/actionview-4.2.2.gem differ diff --git a/vendor/cache/activejob-4.2.1.gem b/vendor/cache/activejob-4.2.1.gem deleted file mode 100644 index 6ea3a3a1..00000000 Binary files a/vendor/cache/activejob-4.2.1.gem and /dev/null differ diff --git a/vendor/cache/activejob-4.2.2.gem b/vendor/cache/activejob-4.2.2.gem new file mode 100644 index 00000000..43ea489d Binary files /dev/null and b/vendor/cache/activejob-4.2.2.gem differ diff --git a/vendor/cache/activemodel-4.2.1.gem b/vendor/cache/activemodel-4.2.1.gem deleted file mode 100644 index 87deb9f4..00000000 Binary files a/vendor/cache/activemodel-4.2.1.gem and /dev/null differ diff --git a/vendor/cache/activemodel-4.2.2.gem b/vendor/cache/activemodel-4.2.2.gem new file mode 100644 index 00000000..36cf4da8 Binary files /dev/null and b/vendor/cache/activemodel-4.2.2.gem differ diff --git a/vendor/cache/activerecord-4.2.1.gem b/vendor/cache/activerecord-4.2.1.gem deleted file mode 100644 index 53568d8f..00000000 Binary files a/vendor/cache/activerecord-4.2.1.gem and /dev/null differ diff --git a/vendor/cache/activerecord-4.2.2.gem b/vendor/cache/activerecord-4.2.2.gem new file mode 100644 index 00000000..97792de8 Binary files /dev/null and b/vendor/cache/activerecord-4.2.2.gem differ diff --git a/vendor/cache/activesupport-4.2.1.gem b/vendor/cache/activesupport-4.2.1.gem deleted file mode 100644 index 88242c39..00000000 Binary files a/vendor/cache/activesupport-4.2.1.gem and /dev/null differ diff --git a/vendor/cache/activesupport-4.2.2.gem b/vendor/cache/activesupport-4.2.2.gem new file mode 100644 index 00000000..afc0fd74 Binary files /dev/null and b/vendor/cache/activesupport-4.2.2.gem differ diff --git a/vendor/cache/jquery-rails-4.0.3.gem b/vendor/cache/jquery-rails-4.0.3.gem deleted file mode 100644 index a4f87923..00000000 Binary files a/vendor/cache/jquery-rails-4.0.3.gem and /dev/null differ diff --git a/vendor/cache/jquery-rails-4.0.4.gem b/vendor/cache/jquery-rails-4.0.4.gem new file mode 100644 index 00000000..0a492220 Binary files /dev/null and b/vendor/cache/jquery-rails-4.0.4.gem differ diff --git a/vendor/cache/listen-2.10.0.gem b/vendor/cache/listen-2.10.0.gem deleted file mode 100644 index 61a9eabf..00000000 Binary files a/vendor/cache/listen-2.10.0.gem and /dev/null differ diff --git a/vendor/cache/listen-2.10.1.gem b/vendor/cache/listen-2.10.1.gem new file mode 100644 index 00000000..35f67e0a Binary files /dev/null and b/vendor/cache/listen-2.10.1.gem differ diff --git a/vendor/cache/rack-1.6.1.gem b/vendor/cache/rack-1.6.1.gem deleted file mode 100644 index f58f3557..00000000 Binary files a/vendor/cache/rack-1.6.1.gem and /dev/null differ diff --git a/vendor/cache/rack-1.6.2.gem b/vendor/cache/rack-1.6.2.gem new file mode 100644 index 00000000..0ffb5408 Binary files /dev/null and b/vendor/cache/rack-1.6.2.gem differ diff --git a/vendor/cache/rails-4.2.1.gem b/vendor/cache/rails-4.2.1.gem deleted file mode 100644 index fa4aa70d..00000000 Binary files a/vendor/cache/rails-4.2.1.gem and /dev/null differ diff --git a/vendor/cache/rails-4.2.2.gem b/vendor/cache/rails-4.2.2.gem new file mode 100644 index 00000000..a4bafc16 Binary files /dev/null and b/vendor/cache/rails-4.2.2.gem differ diff --git a/vendor/cache/railties-4.2.1.gem b/vendor/cache/railties-4.2.1.gem deleted file mode 100644 index cadf8248..00000000 Binary files a/vendor/cache/railties-4.2.1.gem and /dev/null differ diff --git a/vendor/cache/railties-4.2.2.gem b/vendor/cache/railties-4.2.2.gem new file mode 100644 index 00000000..18256f5b Binary files /dev/null and b/vendor/cache/railties-4.2.2.gem differ diff --git a/vendor/cache/web-console-2.1.2.gem b/vendor/cache/web-console-2.1.2.gem deleted file mode 100644 index bbd0d9af..00000000 Binary files a/vendor/cache/web-console-2.1.2.gem and /dev/null differ diff --git a/vendor/cache/web-console-2.1.3.gem b/vendor/cache/web-console-2.1.3.gem new file mode 100644 index 00000000..88d11b00 Binary files /dev/null and b/vendor/cache/web-console-2.1.3.gem differ