From 091d6a39a6289abbe044b3d94134b8722546aa90 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 2 Mar 2016 08:42:00 -0500 Subject: [PATCH 1/4] 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 From cc33bd705436c59f81b601d0062f2e9777716d42 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 2 Mar 2016 15:02:38 -0500 Subject: [PATCH 2/4] Upgraded sprockets-rails gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 36a29b3..d503306 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -290,7 +290,7 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.3) + sprockets-rails (3.0.4) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) From 44e8b0c83cfebcb2b1d3a49d59195e184dd703a5 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sun, 6 Mar 2016 07:48:31 -0500 Subject: [PATCH 3/4] Upgraded bcrypt gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d503306..7d8c5a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,7 +42,7 @@ GEM childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) - bcrypt (3.1.10) + bcrypt (3.1.11) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) From 1abc61f8fa4e991891cf7bc068a2ecf39dd586c7 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 8 Mar 2016 09:19:55 -0500 Subject: [PATCH 4/4] Upgraded rails to 4.2.6 --- Gemfile | 2 +- Gemfile.lock | 60 ++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) mode change 100755 => 100644 Gemfile diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index 867ac8d..2fb0d73 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' #don't upgrade -gem 'rails', '4.2.6.rc1' +gem 'rails', '4.2.6' ruby '2.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 7d8c5a2..89cba7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.6.rc1) - actionpack (= 4.2.6.rc1) - actionview (= 4.2.6.rc1) - activejob (= 4.2.6.rc1) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6.rc1) - actionview (= 4.2.6.rc1) - activesupport (= 4.2.6.rc1) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) 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.6.rc1) - activesupport (= 4.2.6.rc1) + actionview (4.2.6) + activesupport (= 4.2.6) 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.6.rc1) - activesupport (= 4.2.6.rc1) + activejob (4.2.6) + activesupport (= 4.2.6) globalid (>= 0.3.0) - activemodel (4.2.6.rc1) - activesupport (= 4.2.6.rc1) + activemodel (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) - activerecord (4.2.6.rc1) - activemodel (= 4.2.6.rc1) - activesupport (= 4.2.6.rc1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) arel (~> 6.0) - activesupport (4.2.6.rc1) + activesupport (4.2.6) 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.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) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6.rc1) + railties (= 4.2.6) 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.6.rc1) - actionpack (= 4.2.6.rc1) - activesupport (= 4.2.6.rc1) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) 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.6.rc1) + rails (= 4.2.6) rb-fsevent rspec-rails (= 2.14.2) sass-rails