From 4cad787343ab57e142c35c50ab4b69d8d8a92ab5 Mon Sep 17 00:00:00 2001 From: Adam Cooke Date: Wed, 12 Feb 2020 10:52:31 +0000 Subject: [PATCH] upgrade dependencies * rails, puma, bunny, mysql2 * remove createsend which isn't needed/used * don't require highline all the time --- Gemfile | 11 ++-- Gemfile.lock | 147 +++++++++++++++++++++++++-------------------------- 2 files changed, 76 insertions(+), 82 deletions(-) diff --git a/Gemfile b/Gemfile index 79f8a10..19d4b5a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' -gem 'rails', '= 5.2.2.1' -gem 'mysql2', '>= 0.3.18', '< 0.5' -gem 'puma', '~> 3.0' +gem 'rails', '= 5.2.4.1' +gem 'mysql2' +gem 'puma' gem 'turbolinks', '~> 5' gem 'haml' gem 'nifty-utils' @@ -15,7 +15,7 @@ gem 'dynamic_form' gem 'changey' gem 'mail', :git => 'https://github.com/mikel/mail.git', :branch => '2-7-stable' gem 'autoprefixer-rails' -gem 'bunny', '~> 2.5.1' +gem 'bunny' gem 'secure_headers' gem 'chronic' gem 'basic_ssl' @@ -27,9 +27,8 @@ gem 'sentry-raven' gem 'gelf' gem 'moonrope' gem 'jwt' -gem 'createsend', '~> 4.0' gem 'acme-client' -gem 'highline', :require => true +gem 'highline', :require => false group :development, :assets do gem 'sass-rails', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock index dfa82c6..1a711a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/mikel/mail.git - revision: 3204c0b4733166b9664a552006286227dea09953 + revision: 904fc3299163771ca47d5cc5c2f540f6f828c2d6 branch: 2-7-stable specs: mail (2.7.2.edge) @@ -11,43 +11,43 @@ GEM specs: acme-client (2.0.0) faraday (~> 0.9, >= 0.9.1) - actioncable (5.2.2.1) - actionpack (= 5.2.2.1) + actioncable (5.2.4.1) + actionpack (= 5.2.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) + actionmailer (5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.2.1) - actionview (= 5.2.2.1) - activesupport (= 5.2.2.1) - rack (~> 2.0) + actionpack (5.2.4.1) + actionview (= 5.2.4.1) + activesupport (= 5.2.4.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.2.1) - activesupport (= 5.2.2.1) + actionview (5.2.4.1) + activesupport (= 5.2.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.2.1) - activesupport (= 5.2.2.1) + activejob (5.2.4.1) + activesupport (= 5.2.4.1) globalid (>= 0.3.6) - activemodel (5.2.2.1) - activesupport (= 5.2.2.1) - activerecord (5.2.2.1) - activemodel (= 5.2.2.1) - activesupport (= 5.2.2.1) + activemodel (5.2.4.1) + activesupport (= 5.2.4.1) + activerecord (5.2.4.1) + activemodel (= 5.2.4.1) + activesupport (= 5.2.4.1) arel (>= 9.0) - activestorage (5.2.2.1) - actionpack (= 5.2.2.1) - activerecord (= 5.2.2.1) + activestorage (5.2.4.1) + actionpack (= 5.2.4.1) + activerecord (= 5.2.4.1) marcel (~> 0.3.1) - activesupport (5.2.2.1) + activesupport (5.2.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -57,15 +57,16 @@ GEM activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) arel (9.0.0) - authie (3.1.5) + authie (3.3.1) + secure_random_string autoprefixer-rails (9.1.3) execjs basic_ssl (1.0.3) bcrypt (3.1.12) bson (4.3.0) - builder (3.2.3) - bunny (2.5.1) - amq-protocol (>= 2.0.1) + builder (3.2.4) + bunny (2.14.4) + amq-protocol (~> 2.3, >= 2.3.0) byebug (10.0.2) changey (1.0.0) activerecord (>= 4.2, < 6) @@ -79,18 +80,14 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) - crass (1.0.5) - createsend (4.1.2) - hashie (~> 3.0) - httparty (~> 0.14) - json (>= 1.0) + concurrent-ruby (1.1.6) + crass (1.0.6) database_cleaner (1.7.0) deep_merge (1.2.1) diff-lcs (1.3) dynamic_form (1.1.4) encrypto_signo (1.0.0) - erubi (1.8.0) + erubi (1.9.0) execjs (2.7.0) factory_bot (4.11.1) activesupport (>= 3.0.0) @@ -106,14 +103,12 @@ GEM json globalid (0.4.2) activesupport (>= 4.2.0) - haml (5.0.4) + haml (5.1.2) temple (>= 0.8.0) tilt hashie (3.6.0) highline (2.0.0) - httparty (0.16.2) - multi_xml (>= 0.5.2) - i18n (1.6.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) @@ -133,61 +128,61 @@ GEM activerecord kaminari-core (= 1.1.1) kaminari-core (1.1.1) - loofah (2.3.1) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mimemagic (0.3.3) + mimemagic (0.3.4) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.0) mongo (2.6.2) bson (>= 4.3.0, < 5.0.0) moonrope (2.0.1) deep_merge (~> 1.0) json (~> 1.7) rack (>= 1.4) - multi_xml (0.6.0) multipart-post (2.0.0) - mysql2 (0.4.10) + mysql2 (0.5.3) nifty-utils (1.1.7) nilify_blanks (1.3.0) activerecord (>= 3.0.0) activesupport (>= 3.0.0) - nio4r (2.3.1) - nokogiri (1.10.5) + nio4r (2.5.2) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) - puma (3.12.0) - rack (2.0.6) + puma (4.3.1) + nio4r (~> 2.0) + rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.2.1) - actioncable (= 5.2.2.1) - actionmailer (= 5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) - activemodel (= 5.2.2.1) - activerecord (= 5.2.2.1) - activestorage (= 5.2.2.1) - activesupport (= 5.2.2.1) + rails (5.2.4.1) + actioncable (= 5.2.4.1) + actionmailer (= 5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) + activemodel (= 5.2.4.1) + activerecord (= 5.2.4.1) + activestorage (= 5.2.4.1) + activesupport (= 5.2.4.1) bundler (>= 1.3.0) - railties (= 5.2.2.1) + railties (= 5.2.4.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.2.2.1) - actionpack (= 5.2.2.1) - activesupport (= 5.2.2.1) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.4.1) + actionpack (= 5.2.4.1) + activesupport (= 5.2.4.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (12.3.2) + rake (12.3.3) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -223,7 +218,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - secure_headers (6.0.0) + secure_headers (6.3.0) + secure_random_string (1.0.0) sentry-raven (2.7.4) faraday (>= 0.7.6, < 1.0) sprockets (3.7.2) @@ -233,20 +229,20 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - temple (0.8.0) + temple (0.8.2) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.10) turbolinks (5.2.0) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (4.1.18) execjs (>= 0.3.0, < 3) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) PLATFORMS ruby @@ -258,13 +254,12 @@ DEPENDENCIES autoprefixer-rails basic_ssl bcrypt - bunny (~> 2.5.1) + bunny byebug changey chronic clockwork coffee-rails (~> 4.2) - createsend (~> 4.0) database_cleaner dynamic_form encrypto_signo @@ -280,12 +275,12 @@ DEPENDENCIES mail! mongo moonrope - mysql2 (>= 0.3.18, < 0.5) + mysql2 nifty-utils nilify_blanks nio4r - puma (~> 3.0) - rails (= 5.2.2.1) + puma + rails (= 5.2.4.1) rspec rspec-rails sass-rails (~> 5.0)