diff --git a/Gemfile b/Gemfile index d5528460..3309df73 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' gem 'active_model_serializers', '0.10' gem 'devise', '>= 4.6.0' gem 'devise-i18n', '~> 1' -gem 'devise-jwt', '~> 0.5.6' +gem 'devise-jwt', '~> 0.7.0' gem 'http_accept_language', '~> 2' gem 'i18n-js', '~> 3' gem 'pg', '~> 1' @@ -31,7 +31,7 @@ gem 'nokogiri', '~> 1.10' group :development do gem 'annotate' - gem 'debbie' + gem 'debbie', git: 'https://github.com/mdouchement/debbie' gem 'listen' gem 'rb-readline' gem 'rubocop' diff --git a/Gemfile.lock b/Gemfile.lock index bdcd9fb9..ec295b8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,39 @@ +GIT + remote: https://github.com/mdouchement/debbie + revision: 90cbd9f7e6805120ebdc1e6a73c3fcd223c6ad32 + specs: + debbie (2.0.0) + awesome_print (~> 1.2) + coolline (>= 0.4.2) + hirb (~> 0.7) + pry (~> 0.10) + pry-byebug + pry-doc (~> 0.6) + pry-rails (~> 0.3) + railties (>= 3.0) + GEM remote: https://rubygems.org/ specs: - actioncable (5.2.3) - actionpack (= 5.2.3) + actioncable (5.2.4.3) + actionpack (= 5.2.4.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) + actionmailer (5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) - rack (~> 2.0) + actionpack (5.2.4.3) + actionview (= 5.2.4.3) + activesupport (= 5.2.4.3) + 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.3) - activesupport (= 5.2.3) + actionview (5.2.4.3) + activesupport (= 5.2.4.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -28,43 +42,43 @@ GEM actionpack (>= 4.0) activemodel (>= 4.0) railties (>= 4.0) - active_storage_validations (0.8.3) + active_storage_validations (0.8.9) rails (>= 5.2.0) - activejob (5.2.3) - activesupport (= 5.2.3) + activejob (5.2.4.3) + activesupport (= 5.2.4.3) globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) + activemodel (5.2.4.3) + activesupport (= 5.2.4.3) + activerecord (5.2.4.3) + activemodel (= 5.2.4.3) + activesupport (= 5.2.4.3) arel (>= 9.0) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) + activestorage (5.2.4.3) + actionpack (= 5.2.4.3) + activerecord (= 5.2.4.3) marcel (~> 0.3.1) - activesupport (5.2.3) + activesupport (5.2.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - annotate (3.0.2) + annotate (3.1.1) activerecord (>= 3.2, < 7.0) - rake (>= 10.4, < 13.0) + rake (>= 10.4, < 14.0) arel (9.0.0) - ast (2.4.0) + ast (2.4.1) awesome_print (1.8.0) bcrypt (3.1.13) - bugsnag (6.12.1) + bugsnag (6.13.1) concurrent-ruby (~> 1.0) - builder (3.2.3) + builder (3.2.4) bulma-rails (0.7.5) sassc (~> 2.0) - byebug (11.0.1) - charlock_holmes (0.7.6) - coderay (1.1.2) + byebug (11.1.3) + charlock_holmes (0.7.7) + coderay (1.1.3) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -72,42 +86,35 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) coolline (0.5.0) unicode_utils (~> 1.4) - crass (1.0.5) - database_cleaner (1.7.0) - debbie (2.0.0) - awesome_print (~> 1.2) - coolline (>= 0.4.2) - hirb (~> 0.7) - pry (~> 0.10) - pry-byebug - pry-doc (~> 0.6) - pry-rails (~> 0.3) - railties (>= 3.0) - devise (4.7.1) + crass (1.0.6) + database_cleaner (1.8.5) + devise (4.7.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.8.2) - devise (>= 4.6) - devise-jwt (0.5.9) + devise-i18n (1.9.1) + devise (>= 4.7.1) + devise-jwt (0.7.0) devise (~> 4.0) - warden-jwt_auth (~> 0.3.6) - diff-lcs (1.3) - dry-auto_inject (0.6.1) + warden-jwt_auth (~> 0.4) + diff-lcs (1.4.4) + dry-auto_inject (0.7.0) dry-container (>= 0.3.4) - dry-configurable (0.8.3) + dry-configurable (0.11.6) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.7) + dry-equalizer (~> 0.2) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) dry-core (0.4.9) concurrent-ruby (~> 1.0) + dry-equalizer (0.3.0) erubi (1.9.0) execjs (2.7.0) factory_bot (4.11.1) @@ -117,7 +124,7 @@ GEM railties (>= 3.0.0) faker (1.9.6) i18n (>= 0.7) - ffi (1.11.1) + ffi (1.13.1) font-awesome-rails (4.7.0.5) railties (>= 3.2, < 6.1) globalid (0.4.2) @@ -127,102 +134,101 @@ GEM tilt hirb (0.7.3) http_accept_language (2.1.1) - i18n (1.7.0) + i18n (1.8.3) concurrent-ruby (~> 1.0) - i18n-js (3.3.0) + i18n-js (3.7.1) i18n (>= 0.6.6) - image_processing (1.9.3) + image_processing (1.11.0) mini_magick (>= 4.9.5, < 5) - ruby-vips (>= 2.0.13, < 3) - jaro_winkler (1.5.3) - jquery-rails (4.3.5) + ruby-vips (>= 2.0.17, < 3) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.2.0) + json (2.3.1) json-schema (2.8.1) addressable (>= 2.4) jwt (2.2.1) - kaminari (1.1.1) + kaminari (1.2.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.1.1) - kaminari-activerecord (= 1.1.1) - kaminari-core (= 1.1.1) - kaminari-actionview (1.1.1) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) actionview - kaminari-core (= 1.1.1) - kaminari-activerecord (1.1.1) + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) activerecord - kaminari-core (= 1.1.1) - kaminari-core (1.1.1) - leaflet-rails (1.5.1) + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) + leaflet-rails (1.6.0) rails (>= 4.2.0) - listen (3.2.0) + listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.3.1) + loofah (2.6.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.2) - mimemagic (0.3.3) - mini_magick (4.9.5) + method_source (1.0.0) + mimemagic (0.3.5) + mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.12.2) + minitest (5.14.1) nested_form (0.3.2) nio4r (2.5.2) - nokogiri (1.10.4) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - parallel (1.18.0) - parser (2.6.5.0) - ast (~> 2.4.0) - pg (1.1.4) - postmark (1.18.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) + pg (1.2.3) + postmark (1.21.1) json - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.7.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.9.0) byebug (~> 11.0) - pry (~> 0.10) + pry (~> 0.13.0) pry-doc (0.13.5) pry (~> 0.11) yard (~> 0.9.11) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.1) - puma (3.12.2) + public_suffix (4.0.5) + puma (3.12.6) pundit (1.1.0) activesupport (>= 3.0.0) pundit-matchers (1.6.0) rspec-rails (>= 3.0.0) - rack (2.0.8) - rack-cors (1.0.5) - rack (>= 1.6.0) + rack (2.2.3) + rack-cors (1.1.1) + rack (>= 2.0.0) rack-pjax (1.1.0) nokogiri (~> 1.5) rack (>= 1.1) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) + rails (5.2.4.3) + actioncable (= 5.2.4.3) + actionmailer (= 5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) + activemodel (= 5.2.4.3) + activerecord (= 5.2.4.3) + activestorage (= 5.2.4.3) + activesupport (= 5.2.4.3) bundler (>= 1.3.0) - railties (= 5.2.3) + railties (= 5.2.4.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -232,7 +238,7 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - rails_admin (1.4.2) + rails_admin (1.4.3) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) @@ -245,7 +251,7 @@ GEM rails (>= 4.0, < 6) remotipart (~> 1.3) sass-rails (>= 4.0, < 6) - rails_admin-i18n (1.11.5) + rails_admin-i18n (1.12.0) rails_admin_import (2.2.0) charlock_holmes (~> 0.6) rails (>= 3.2) @@ -254,33 +260,35 @@ GEM rails_admin_slug (0.1.3) rails_admin_state (1.9.1) rails_admin - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) + railties (5.2.4.3) + actionpack (= 5.2.4.3) + activesupport (= 5.2.4.3) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.3) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) ffi (~> 1.0) rb-readline (0.5.5) - recaptcha (5.2.1) + recaptcha (5.5.0) json - remotipart (1.4.3) - responders (3.0.0) + regexp_parser (1.7.1) + remotipart (1.4.4) + responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) - rspec-core (3.9.0) - rspec-support (~> 3.9.0) - rspec-expectations (3.9.0) + rexml (3.2.4) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-mocks (3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-rails (3.9.0) + rspec-rails (3.9.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -288,18 +296,22 @@ GEM rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) - rspec-support (3.9.0) - rubocop (0.75.0) - jaro_winkler (~> 1.5.1) + rspec-support (3.9.3) + rubocop (0.87.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) + rexml + rubocop-ast (>= 0.1.0, < 1.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.1.0) + parser (>= 2.7.0.1) ruby-progressbar (1.10.1) - ruby-vips (2.0.15) + ruby-vips (2.0.17) ffi (~> 1.9) - rubyzip (2.0.0) + rubyzip (2.3.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -311,7 +323,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.2.1) + sassc (2.4.0) ffi (~> 1.9) seed_dump (3.3.1) activerecord (>= 4) @@ -340,28 +352,28 @@ GEM activerecord (>= 4.1) state_machines-activemodel (>= 0.5.0) temple (0.8.2) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) unicode_utils (1.4.0) warden (1.2.8) rack (>= 2.0.6) - warden-jwt_auth (0.3.6) + warden-jwt_auth (0.5.0) dry-auto_inject (~> 0.6) - dry-configurable (~> 0.8) + dry-configurable (~> 0.9) jwt (~> 2.1) warden (~> 1.2) - websocket-driver (0.7.1) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) - wysiwyg-rails (2.9.6) - railties (>= 3.2, < 6.0) - yard (0.9.20) + websocket-extensions (0.1.5) + wysiwyg-rails (2.9.8) + railties (>= 3.2, < 7.0) + yard (0.9.25) PLATFORMS ruby @@ -373,10 +385,10 @@ DEPENDENCIES bugsnag (~> 6.6) bulma-rails (~> 0.7.1) database_cleaner (~> 1.7) - debbie + debbie! devise (>= 4.6.0) devise-i18n (~> 1) - devise-jwt (~> 0.5.6) + devise-jwt (~> 0.7.0) factory_bot_rails (~> 4.8) faker (~> 1.8) http_accept_language (~> 2)