From 6e1d84082bac49f4952641b243092e47adfcd59d Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Mon, 2 Mar 2020 11:15:02 -0500 Subject: [PATCH] Bump rails --- Gemfile | 2 +- Gemfile.lock | 61 ++++++++++++++++++++++++---------------------------- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index 88889f3..612bb19 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.0.2' +gem 'rails', '~> 4.0.2' gem 'sqlite3', '~> 1.3.8', :group => [:development, :test] gem 'pg', :group => :production diff --git a/Gemfile.lock b/Gemfile.lock index d2afe96..e6d1bed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,26 +1,26 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.2) - actionpack (= 4.0.2) - mail (~> 2.5.4) - actionpack (4.0.2) - activesupport (= 4.0.2) + actionmailer (4.0.13) + actionpack (= 4.0.13) + mail (~> 2.5, >= 2.5.4) + actionpack (4.0.13) + activesupport (= 4.0.13) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.2) - activesupport (= 4.0.2) + activemodel (4.0.13) + activesupport (= 4.0.13) builder (~> 3.1.0) - activerecord (4.0.2) - activemodel (= 4.0.2) + activerecord (4.0.13) + activemodel (= 4.0.13) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.2) + activesupport (= 4.0.13) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.4) - activesupport (4.0.2) - i18n (~> 0.6, >= 0.6.4) + activesupport (4.0.13) + i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) @@ -47,30 +47,28 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.6) - mail (2.5.5) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.25.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + mini_mime (1.0.2) minitest (4.7.5) multi_json (1.14.1) pg (0.18.4) - polyglot (0.3.5) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) - rails (4.0.2) - actionmailer (= 4.0.2) - actionpack (= 4.0.2) - activerecord (= 4.0.2) - activesupport (= 4.0.2) + rails (4.0.13) + actionmailer (= 4.0.13) + actionpack (= 4.0.13) + activerecord (= 4.0.13) + activesupport (= 4.0.13) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.2) - sprockets-rails (~> 2.0.0) + railties (= 4.0.13) + sprockets-rails (~> 2.0) rails-lineman (0.3.0) rake - railties (4.0.2) - actionpack (= 4.0.2) - activesupport (= 4.0.2) + railties (4.0.13) + actionpack (= 4.0.13) + activesupport (= 4.0.13) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.2.1) @@ -89,17 +87,14 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) sqlite3 (1.3.13) thor (0.20.3) thread_safe (0.3.6) tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) turbolinks (2.5.4) coffee-rails tzinfo (0.3.56) @@ -114,7 +109,7 @@ DEPENDENCIES jbuilder (~> 1.2) jquery-rails pg - rails (= 4.0.2) + rails (~> 4.0.2) rails-lineman sass-rails (~> 4.0.0) sdoc