From f8b868d12b7e7cd17f221bf9eb710a7fa4ec342a Mon Sep 17 00:00:00 2001 From: Dan Rice Date: Tue, 16 Jun 2015 20:49:19 -0400 Subject: [PATCH] Update Rails to 4.1.11 Resolves #1877 --- Gemfile | 2 +- Gemfile.lock | 72 ++++++++++++++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index 1ab1db7e..b9de2b75 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '~> 4.1.6' +gem 'rails', '~> 4.1.11' gem 'sass-rails', '~> 4.0.3' gem 'coffee-rails', '~> 4.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 2b8a301e..ab7d8c8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,30 +3,30 @@ GEM specs: RedCloth (4.2.9) aasm (3.4.0) - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) + actionmailer (4.1.11) + actionpack (= 4.1.11) + actionview (= 4.1.11) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) + actionpack (4.1.11) + actionview (= 4.1.11) + activesupport (= 4.1.11) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-xml_parser (1.0.1) actionpack (>= 4.0.0.rc1) - actionview (4.1.7) - activesupport (= 4.1.7) + actionview (4.1.11) + activesupport (= 4.1.11) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.7) - activesupport (= 4.1.7) + activemodel (4.1.11) + activesupport (= 4.1.11) builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) + activerecord (4.1.11) + activemodel (= 4.1.11) + activesupport (= 4.1.11) arel (~> 5.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.1.7) + activesupport (4.1.11) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -92,52 +92,52 @@ GEM multi_json (~> 1.3) hike (1.2.3) htmlentities (4.3.2) - i18n (0.6.11) + i18n (0.7.0) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.3) libv8 (3.16.14.7) mail (2.6.3) mime-types (>= 1.16, < 3) metaclass (0.0.4) - mime-types (2.4.3) + mime-types (2.6.1) mini_portile (0.6.1) - minitest (5.4.2) + minitest (5.7.0) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.10.1) + multi_json (1.11.1) multi_test (0.1.1) mysql2 (0.3.16) nokogiri (1.6.4) mini_portile (~> 0.6.0) nokogumbo (1.1.12) nokogiri - rack (1.5.2) + rack (1.5.4) rack-dev-mark (0.7.3) rack (>= 1.1) rack-mini-profiler (0.9.2) rack (>= 1.1.3) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) + rails (4.1.11) + actionmailer (= 4.1.11) + actionpack (= 4.1.11) + actionview (= 4.1.11) + activemodel (= 4.1.11) + activerecord (= 4.1.11) + activesupport (= 4.1.11) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) + railties (= 4.1.11) sprockets-rails (~> 2.0) rails_autolink (1.1.6) rails (> 3.1) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) + railties (4.1.11) + actionpack (= 4.1.11) + activesupport (= 4.1.11) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.2) + rake (10.4.2) ref (1.0.5) rspec-expectations (3.1.2) diff-lcs (>= 1.2.0, < 2.0) @@ -173,7 +173,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.0) + sprockets-rails (2.3.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -185,7 +185,7 @@ GEM libv8 (~> 3.16.14.0) ref thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) tolk (1.6.0) rails (>= 4.0, < 4.2) @@ -228,7 +228,7 @@ DEPENDENCIES mysql2 (~> 0.3.16) rack-dev-mark (= 0.7.3) rack-mini-profiler (~> 0.9.2) - rails (~> 4.1.6) + rails (~> 4.1.11) rails_autolink (~> 1.1.6) rspec-expectations (~> 3.1.2) sanitize (~> 3.0.2)