From 091d6a39a6289abbe044b3d94134b8722546aa90 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 2 Mar 2016 08:42:00 -0500 Subject: [PATCH] Upgraded to 4.2.6.rc1 --- Gemfile | 2 +- Gemfile.lock | 60 ++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index eaafbfb..867ac8d 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' #don't upgrade -gem 'rails', '4.2.5.2' +gem 'rails', '4.2.6.rc1' ruby '2.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index b0d43e4..36a29b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) + actionmailer (4.2.6.rc1) + actionpack (= 4.2.6.rc1) + actionview (= 4.2.6.rc1) + activejob (= 4.2.6.rc1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.2) - actionview (= 4.2.5.2) - activesupport (= 4.2.5.2) + actionpack (4.2.6.rc1) + actionview (= 4.2.6.rc1) + activesupport (= 4.2.6.rc1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.2) - activesupport (= 4.2.5.2) + actionview (4.2.6.rc1) + activesupport (= 4.2.6.rc1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5.2) - activesupport (= 4.2.5.2) + activejob (4.2.6.rc1) + activesupport (= 4.2.6.rc1) globalid (>= 0.3.0) - activemodel (4.2.5.2) - activesupport (= 4.2.5.2) + activemodel (4.2.6.rc1) + activesupport (= 4.2.6.rc1) builder (~> 3.1) - activerecord (4.2.5.2) - activemodel (= 4.2.5.2) - activesupport (= 4.2.5.2) + activerecord (4.2.6.rc1) + activemodel (= 4.2.6.rc1) + activesupport (= 4.2.6.rc1) arel (~> 6.0) - activesupport (4.2.5.2) + activesupport (4.2.6.rc1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -210,16 +210,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.2) - actionmailer (= 4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) - activemodel (= 4.2.5.2) - activerecord (= 4.2.5.2) - activesupport (= 4.2.5.2) + rails (4.2.6.rc1) + actionmailer (= 4.2.6.rc1) + actionpack (= 4.2.6.rc1) + actionview (= 4.2.6.rc1) + activejob (= 4.2.6.rc1) + activemodel (= 4.2.6.rc1) + activerecord (= 4.2.6.rc1) + activesupport (= 4.2.6.rc1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.2) + railties (= 4.2.6.rc1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -229,9 +229,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.5.2) - actionpack (= 4.2.5.2) - activesupport (= 4.2.5.2) + railties (4.2.6.rc1) + actionpack (= 4.2.6.rc1) + activesupport (= 4.2.6.rc1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) @@ -360,7 +360,7 @@ DEPENDENCIES pry pry-rails rack-livereload - rails (= 4.2.5.2) + rails (= 4.2.6.rc1) rb-fsevent rspec-rails (= 2.14.2) sass-rails