From 07298a8cd04324ebe5890650fbd5477fde6afce8 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Mon, 28 Jan 2019 17:18:02 -0600 Subject: [PATCH] Rails v4.2 --- Gemfile | 4 +-- Gemfile.lock | 74 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 48 insertions(+), 30 deletions(-) diff --git a/Gemfile b/Gemfile index cd0d63c9..2ad39ee4 100755 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '2.3.7' gem 'rake' -gem 'rails', '~> 4.1' +gem 'rails', '~> 4.2.8' gem 'rails_12factor' # https://stripe.com/docs/api gem 'stripe' @@ -72,7 +72,7 @@ gem 'httparty' # User authentication # https://github.com/plataformatec/devise -gem 'devise' +gem 'devise', '~> 3.5.0' gem 'devise-async' # http://www.rubygeocoder.com/ diff --git a/Gemfile.lock b/Gemfile.lock index 947a66ab..6968910b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,14 +42,16 @@ GEM remote: https://rubygems.org/ specs: action_mailer_matchers (1.0.0) - actionmailer (4.1.16) - actionpack (= 4.1.16) - actionview (= 4.1.16) + actionmailer (4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.16) - actionview (= 4.1.16) - activesupport (= 4.1.16) - rack (~> 1.5.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.11) + actionview (= 4.2.11) + activesupport (= 4.2.11) + rack (~> 1.6) rack-test (~> 0.6.2) activemodel (4.0.0) activesupport (= 4.0.0) @@ -66,7 +68,7 @@ GEM addressable (2.3.8) amq-protocol (2.2.0) andand (1.3.3) - arel (5.0.1.20140414130214) + arel (6.0.4) ast (2.4.0) aws-eventstream (1.0.1) aws-partitions (1.110.0) @@ -132,6 +134,7 @@ GEM unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) + crass (1.0.4) css_parser (1.6.0) addressable dalli (2.7.9) @@ -203,8 +206,8 @@ GEM railties (>= 3.0.0) faraday (0.11.0) multipart-post (>= 1.2, < 3) - faraday_middleware (0.9.1) - faraday (>= 0.7.4, < 0.10) + faraday_middleware (0.13.0) + faraday (>= 0.7.4, < 1.0) font_assets (0.1.14) rack foreman (0.85.0) @@ -215,6 +218,8 @@ GEM hashie (>= 2.0, < 4.0) geocoder (1.5.0) get_process_mem (0.2.3) + globalid (0.4.2) + activesupport (>= 4.2.0) grape (1.1.0) activesupport builder @@ -262,6 +267,9 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) mail_view (2.0.4) @@ -304,7 +312,7 @@ GEM puma (>= 2.7, < 4) rabl (0.14.0) activesupport (>= 2.3.14) - rack (1.5.5) + rack (1.6.11) rack-accept (0.4.5) rack (>= 0.4) rack-attack (5.4.2) @@ -314,16 +322,25 @@ GEM rack-test (0.6.3) rack (>= 1.0) rack-timeout (0.5.1) - rails (4.1.16) - actionmailer (= 4.1.16) - actionpack (= 4.1.16) - actionview (= 4.1.16) - activemodel (= 4.1.16) - activerecord (= 4.1.16) - activesupport (= 4.1.16) + rails (4.2.11) + actionmailer (= 4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) + activemodel (= 4.2.11) + activerecord (= 4.2.11) + activesupport (= 4.2.11) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.16) - sprockets-rails (~> 2.0) + railties (= 4.2.11) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) @@ -343,8 +360,9 @@ GEM request_store (1.4.1) rack (>= 1.4) require_all (2.0.0) - responders (1.1.2) - railties (>= 3.2, < 4.2) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) @@ -418,10 +436,10 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) stripe (1.58.0) rest-client (>= 1.4, < 4.0) table_print (1.5.6) @@ -477,7 +495,7 @@ DEPENDENCIES database_cleaner debase delayed_job_active_record - devise + devise (~> 3.5.0) devise-async dotenv-rails dry-validation @@ -514,7 +532,7 @@ DEPENDENCIES rack-attack rack-ssl rack-timeout - rails (~> 4.1) + rails (~> 4.2.8) rails-i18n (~> 4.0) rails_12factor rake