From 1d3540dbb2b5c11698db8992c1488132388daade Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sat, 13 Sep 2014 14:09:46 -0400 Subject: [PATCH] Upgraded Rails to 4.0.10 --- Gemfile | 2 +- Gemfile.lock | 55 ++++++++++++++++++++++++---------------------------- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index b63980f..65603bd 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' #don't upgrade -gem 'rails', '4.0.9' +gem 'rails', '4.0.10' gem 'protected_attributes' # For Rails 4.0+ ruby '2.1.2' diff --git a/Gemfile.lock b/Gemfile.lock index 1adcbd3..ff6594b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,25 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.9) - actionpack (= 4.0.9) - mail (~> 2.5.4) - actionpack (4.0.9) - activesupport (= 4.0.9) + actionmailer (4.0.10) + actionpack (= 4.0.10) + mail (~> 2.5, >= 2.5.4) + actionpack (4.0.10) + activesupport (= 4.0.10) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.9) - activesupport (= 4.0.9) + activemodel (4.0.10) + activesupport (= 4.0.10) builder (~> 3.1.0) - activerecord (4.0.9) - activemodel (= 4.0.9) + activerecord (4.0.10) + activemodel (= 4.0.10) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.9) + activesupport (= 4.0.10) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.9) + activesupport (4.0.10) i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) @@ -140,15 +140,14 @@ GEM kgio (2.9.2) launchy (2.4.2) addressable (~> 2.3) - libv8 (3.16.14.5) + libv8 (3.16.14.7) listen (2.7.9) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.9) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + mail (2.6.1) + mime-types (>= 1.16, < 3) mailcatcher (0.2.4) eventmachine haml @@ -160,7 +159,7 @@ GEM sqlite3-ruby thin method_source (0.8.2) - mime-types (1.25.1) + mime-types (2.3) mini_portile (0.5.3) minitest (4.7.5) multi_json (1.10.1) @@ -173,7 +172,6 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.5) powder (0.2.1) thor (>= 0.11.5) protected_attributes (1.0.8) @@ -189,17 +187,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (4.0.9) - actionmailer (= 4.0.9) - actionpack (= 4.0.9) - activerecord (= 4.0.9) - activesupport (= 4.0.9) + rails (4.0.10) + actionmailer (= 4.0.10) + actionpack (= 4.0.10) + activerecord (= 4.0.10) + activesupport (= 4.0.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.9) + railties (= 4.0.10) sprockets-rails (~> 2.0) - railties (4.0.9) - actionpack (= 4.0.9) - activesupport (= 4.0.9) + railties (4.0.10) + actionpack (= 4.0.10) + activesupport (= 4.0.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -280,9 +278,6 @@ GEM hitimes travis-lint (2.0.0) json - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) trollop (2.0) turbolinks (2.3.0) coffee-rails @@ -328,7 +323,7 @@ DEPENDENCIES protected_attributes pry rack-livereload - rails (= 4.0.9) + rails (= 4.0.10) rb-fsevent rspec-rails (= 2.14.2) sass-rails