From 91f2386282fafa4f10cd499fa9ae8bef9e180373 Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Thu, 20 Nov 2014 15:51:16 -0500 Subject: [PATCH] Bump to rails 4.3.18 --- Gemfile | 2 +- Gemfile.lock | 80 ++++++++++++++++++++++++++-------------------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Gemfile b/Gemfile index e980654..5588f52 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.1.6' +gem 'rails', '4.1.8' gem 'sqlite3' gem 'sass-rails', '~> 4.0.3' gem 'uglifier', '>= 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 963c8cf..ecddd66 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.6) - actionpack (= 4.1.6) - actionview (= 4.1.6) + actionmailer (4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.6) - actionview (= 4.1.6) - activesupport (= 4.1.6) + actionpack (4.1.8) + actionview (= 4.1.8) + activesupport (= 4.1.8) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.6) - activesupport (= 4.1.6) + actionview (4.1.8) + activesupport (= 4.1.8) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.6) - activesupport (= 4.1.6) + activemodel (4.1.8) + activesupport (= 4.1.8) builder (~> 3.1) - activerecord (4.1.6) - activemodel (= 4.1.6) - activesupport (= 4.1.6) + activerecord (4.1.8) + activemodel (= 4.1.8) + activesupport (= 4.1.8) arel (~> 5.0.0) - activesupport (4.1.6) + activesupport (4.1.8) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -42,13 +42,13 @@ GEM execjs coffee-script-source (1.8.0) erubis (2.7.0) - execjs (2.2.1) + execjs (2.2.2) faraday (0.9.0) multipart-post (>= 1.2, < 3) hashie (3.3.1) hike (1.2.3) i18n (0.6.11) - jbuilder (2.1.3) + jbuilder (2.2.5) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (3.1.2) @@ -56,10 +56,10 @@ GEM thor (>= 0.14, < 2.0) json (1.8.1) jwt (1.0.0) - mail (2.6.1) + mail (2.6.3) mime-types (>= 1.16, < 3) - mime-types (2.3) - minitest (5.4.2) + mime-types (2.4.3) + minitest (5.4.3) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) @@ -72,7 +72,7 @@ GEM omniauth (1.2.2) hashie (>= 1.2, < 4) rack (~> 1.0) - omniauth-google-oauth2 (0.2.5) + omniauth-google-oauth2 (0.2.6) omniauth (> 1.0) omniauth-oauth2 (~> 1.1) omniauth-oauth2 (1.2.0) @@ -85,19 +85,19 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.6) - actionmailer (= 4.1.6) - actionpack (= 4.1.6) - actionview (= 4.1.6) - activemodel (= 4.1.6) - activerecord (= 4.1.6) - activesupport (= 4.1.6) + rails (4.1.8) + actionmailer (= 4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) + activemodel (= 4.1.8) + activerecord (= 4.1.8) + activesupport (= 4.1.8) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.6) + railties (= 4.1.8) sprockets-rails (~> 2.0) - railties (4.1.6) - actionpack (= 4.1.6) - activesupport (= 4.1.6) + railties (4.1.8) + actionpack (= 4.1.8) + activesupport (= 4.1.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) @@ -105,29 +105,29 @@ GEM rdoc (4.1.2) json (~> 1.4) sass (3.2.19) - sass-rails (4.0.3) + sass-rails (4.0.4) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.0) - sprockets (~> 2.8, <= 2.11.0) + sass (~> 3.2.2) + sprockets (~> 2.8, < 2.12) sprockets-rails (~> 2.0) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) spring (1.1.3) - sprockets (2.11.0) + sprockets (2.11.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.4) + sprockets-rails (2.2.0) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) - sqlite3 (1.3.9) + sprockets (>= 2.8, < 4.0) + sqlite3 (1.3.10) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - turbolinks (2.3.0) + turbolinks (2.5.2) coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) @@ -147,7 +147,7 @@ DEPENDENCIES jquery-rails omniauth-google-oauth2 (~> 0.2.5) quiet_assets - rails (= 4.1.6) + rails (= 4.1.8) rb-readline sass-rails (~> 4.0.3) sdoc (~> 0.4.0)