From 826a9f6c01ed8a654204846136b69e6900ec7198 Mon Sep 17 00:00:00 2001 From: Tiziana Romani Date: Wed, 13 Nov 2019 14:24:04 -0300 Subject: [PATCH] dependencies update --- Gemfile | 5 +- Gemfile.lock | 189 +++++++++++++++++----------------- app/assets/config/manifest.js | 1 + config/application.rb | 1 - 4 files changed, 99 insertions(+), 97 deletions(-) create mode 100644 app/assets/config/manifest.js diff --git a/Gemfile b/Gemfile index c1b8e9eb9..240cd1e7b 100644 --- a/Gemfile +++ b/Gemfile @@ -13,14 +13,15 @@ gem 'devise', '~> 4.7.1' gem 'devise_token_auth', '~> 1.1.2' gem 'draper', '~> 3.1' gem 'figaro', '~> 1.1.1' -gem 'haml-rails', '~> 1.0.0' +gem 'haml-rails', '~> 2.0', '>= 2.0.1' gem 'jbuilder', '~> 2.9.1' gem 'oj', '~> 3.7', '>= 3.7.12' -gem 'pg', '~> 0.18.2' +gem 'pg', '~> 1.1', '>= 1.1.4' gem 'pry-rails', '~> 0.3.6' gem 'puma', '~> 3.0' gem 'rack-cors', '~> 0.4.0' gem 'sendgrid', '~> 1.2.4' +gem 'sprockets', '~> 3.7.2' gem 'webpacker', '~> 4.0' # Use Redis adapter to run Action Cable in production # gem 'redis', '~> 4.0' diff --git a/Gemfile.lock b/Gemfile.lock index f5aa1c4af..270aa277f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,45 +1,45 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.0.0) - actionpack (= 6.0.0) + actioncable (6.0.1) + actionpack (= 6.0.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.0) - actionpack (= 6.0.0) - activejob (= 6.0.0) - activerecord (= 6.0.0) - activestorage (= 6.0.0) - activesupport (= 6.0.0) + actionmailbox (6.0.1) + actionpack (= 6.0.1) + activejob (= 6.0.1) + activerecord (= 6.0.1) + activestorage (= 6.0.1) + activesupport (= 6.0.1) mail (>= 2.7.1) - actionmailer (6.0.0) - actionpack (= 6.0.0) - actionview (= 6.0.0) - activejob (= 6.0.0) + actionmailer (6.0.1) + actionpack (= 6.0.1) + actionview (= 6.0.1) + activejob (= 6.0.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.0) - actionview (= 6.0.0) - activesupport (= 6.0.0) + actionpack (6.0.1) + actionview (= 6.0.1) + activesupport (= 6.0.1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.0) - actionpack (= 6.0.0) - activerecord (= 6.0.0) - activestorage (= 6.0.0) - activesupport (= 6.0.0) + actiontext (6.0.1) + actionpack (= 6.0.1) + activerecord (= 6.0.1) + activestorage (= 6.0.1) + activesupport (= 6.0.1) nokogiri (>= 1.8.5) - actionview (6.0.0) - activesupport (= 6.0.0) + actionview (6.0.1) + activesupport (= 6.0.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_storage_base64 (1.0.0) rails (~> 6.0) - activeadmin (2.2.0) + activeadmin (2.4.0) arbre (~> 1.2, >= 1.2.1) formtastic (~> 3.1) formtastic_i18n (~> 0.4) @@ -51,31 +51,31 @@ GEM sassc-rails (~> 2.1) sprockets (>= 3.0, < 4.1) sprockets-es6 (~> 0.9, >= 0.9.2) - activejob (6.0.0) - activesupport (= 6.0.0) + activejob (6.0.1) + activesupport (= 6.0.1) globalid (>= 0.3.6) - activemodel (6.0.0) - activesupport (= 6.0.0) + activemodel (6.0.1) + activesupport (= 6.0.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.0) - activemodel (= 6.0.0) - activesupport (= 6.0.0) - activestorage (6.0.0) - actionpack (= 6.0.0) - activejob (= 6.0.0) - activerecord (= 6.0.0) + activerecord (6.0.1) + activemodel (= 6.0.1) + activesupport (= 6.0.1) + activestorage (6.0.1) + actionpack (= 6.0.1) + activejob (= 6.0.1) + activerecord (= 6.0.1) marcel (~> 0.3.1) - activesupport (6.0.0) + activesupport (6.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.1, >= 2.1.8) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + zeitwerk (~> 2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) annotate (2.6.7) activerecord (>= 2.3.0) rake (~> 10.4.2, >= 10.4.2) @@ -83,17 +83,17 @@ GEM activesupport (>= 3.0.0) ast (2.4.0) aws-eventstream (1.0.3) - aws-partitions (1.206.0) - aws-sdk-core (3.64.0) + aws-partitions (1.238.0) + aws-sdk-core (3.76.0) aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1.0) + aws-partitions (~> 1, >= 1.228.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.24.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-kms (1.25.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.46.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-s3 (1.53.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) @@ -129,7 +129,7 @@ GEM concurrent-ruby (1.1.5) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.5) delayed_job (4.1.8) activesupport (>= 3.0, < 6.1) delayed_job_active_record (4.1.4) @@ -143,7 +143,7 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise_token_auth (1.1.2) + devise_token_auth (1.1.3) bcrypt (~> 3.0) devise (> 3.5.2, < 5) rails (>= 4.2.0, < 6.1) @@ -166,7 +166,7 @@ GEM railties (>= 3.0.0) faker (1.7.3) i18n (~> 0.5) - ffi (1.11.1) + ffi (1.11.2) figaro (1.1.1) thor (~> 0.14) formtastic (3.1.5) @@ -177,12 +177,12 @@ GEM haml (5.1.2) temple (>= 0.8.0) tilt - haml-rails (1.0.0) - actionpack (>= 4.0.1) - activesupport (>= 4.0.1) + haml-rails (2.0.1) + actionpack (>= 5.1) + activesupport (>= 5.1) haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) - railties (>= 4.0.1) + railties (>= 5.1) has_scope (0.7.2) actionpack (>= 4.1) activesupport (>= 4.1) @@ -200,7 +200,7 @@ GEM has_scope (~> 0.6) railties (>= 5.0, < 6.1) responders (>= 2, < 4) - jaro_winkler (1.5.3) + jaro_winkler (1.5.4) jbuilder (2.9.1) activesupport (>= 4.2.0) jmespath (1.4.0) @@ -229,7 +229,7 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.3.0) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -240,17 +240,17 @@ GEM mimemagic (0.3.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.12.2) + minitest (5.13.0) msgpack (1.3.1) - nio4r (2.4.0) - nokogiri (1.10.4) + nio4r (2.5.2) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) - oj (3.9.0) + oj (3.9.2) orm_adapter (0.5.0) - parallel (1.17.0) - parser (2.6.3.0) + parallel (1.18.0) + parser (2.6.5.0) ast (~> 2.4.0) - pg (0.18.4) + pg (1.1.4) polyamorous (2.3.0) activerecord (>= 5.0) pry (0.12.2) @@ -262,7 +262,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) psych (3.1.0) - public_suffix (3.1.1) + public_suffix (4.0.1) puma (3.12.1) rack (2.0.7) rack-cors (0.4.1) @@ -270,20 +270,20 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.0) - actioncable (= 6.0.0) - actionmailbox (= 6.0.0) - actionmailer (= 6.0.0) - actionpack (= 6.0.0) - actiontext (= 6.0.0) - actionview (= 6.0.0) - activejob (= 6.0.0) - activemodel (= 6.0.0) - activerecord (= 6.0.0) - activestorage (= 6.0.0) - activesupport (= 6.0.0) + rails (6.0.1) + actioncable (= 6.0.1) + actionmailbox (= 6.0.1) + actionmailer (= 6.0.1) + actionpack (= 6.0.1) + actiontext (= 6.0.1) + actionview (= 6.0.1) + activejob (= 6.0.1) + activemodel (= 6.0.1) + activerecord (= 6.0.1) + activestorage (= 6.0.1) + activesupport (= 6.0.1) bundler (>= 1.3.0) - railties (= 6.0.0) + railties (= 6.0.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -298,9 +298,9 @@ GEM json require_all (~> 2.0) ruby-progressbar - railties (6.0.0) - actionpack (= 6.0.0) - activesupport (= 6.0.0) + railties (6.0.1) + actionpack (= 6.0.1) + activesupport (= 6.0.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -329,13 +329,13 @@ GEM railties (>= 5.0) rspec-core (3.8.2) rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rspec-expectations (3.8.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-mocks (3.8.1) + rspec-mocks (3.8.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-rails (3.8.3) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -343,22 +343,22 @@ GEM rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) - rspec-support (3.8.2) - rubocop (0.74.0) + rspec-support (3.8.3) + rubocop (0.76.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.3.1) + rubocop-rails (2.3.2) rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) - ruby_parser (3.13.1) + ruby_parser (3.14.1) sexp_processor (~> 4.9) safe_yaml (1.0.5) - sassc (2.1.0) + sassc (2.2.1) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -368,7 +368,7 @@ GEM tilt sendgrid (1.2.4) json - sexp_processor (4.12.1) + sexp_processor (4.13.0) shoulda-matchers (3.1.3) activesupport (>= 4.0.0) simplecov (0.13.0) @@ -391,17 +391,17 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - temple (0.8.1) + temple (0.8.2) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.9) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) unicode-display_width (1.6.0) - uniform_notifier (1.12.1) + uniform_notifier (1.13.0) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -413,14 +413,14 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpacker (4.0.7) + webpacker (4.2.0) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) - zeitwerk (2.2.0) + zeitwerk (2.2.1) PLATFORMS ruby @@ -441,12 +441,12 @@ DEPENDENCIES factory_bot_rails (~> 4.8.2) faker (~> 1.7.3) figaro (~> 1.1.1) - haml-rails (~> 1.0.0) + haml-rails (~> 2.0, >= 2.0.1) jbuilder (~> 2.9.1) letter_opener (~> 1.4.1) listen (~> 3.0.5) oj (~> 3.7, >= 3.7.12) - pg (~> 0.18.2) + pg (~> 1.1, >= 1.1.4) pry-byebug (~> 3.3.0) pry-rails (~> 0.3.6) puma (~> 3.0) @@ -461,6 +461,7 @@ DEPENDENCIES simplecov (~> 0.13.0) spring spring-watcher-listen (~> 2.0.1) + sprockets (~> 3.7.2) tzinfo-data uglifier (~> 2.7.2) webmock (~> 2.3.2) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1 @@ +{} diff --git a/config/application.rb b/config/application.rb index c4817f0c2..ac29c5e95 100644 --- a/config/application.rb +++ b/config/application.rb @@ -10,7 +10,6 @@ require 'action_view/railtie' require 'action_cable/engine' require 'active_storage/engine' -require 'sprockets/railtie' require 'rails/test_unit/railtie' # Require the gems listed in Gemfile, including any gems