diff --git a/Gemfile b/Gemfile index 1ed7462c..c4c66314 100644 --- a/Gemfile +++ b/Gemfile @@ -104,7 +104,7 @@ gem 'cancancan' gem 'activeadmin', '~> 2.7' gem 'exception_handler', '~> 0.3.45' -gem 'nokogiri', '1.10.9', require: false +gem 'nokogiri', '1.13.9', require: false gem 'oauth', '0.5.4', require: false gem 'oauth2', '1.4.4', require: false diff --git a/Gemfile.lock b/Gemfile.lock index dc3638fd..9256cf04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,17 +64,15 @@ GEM activesupport (>= 4.2) active_record_union (1.3.0) activerecord (>= 4.0) - activeadmin (2.7.0) + activeadmin (2.12.0) arbre (~> 1.2, >= 1.2.1) - formtastic (~> 3.1) + formtastic (>= 3.1, < 5.0) formtastic_i18n (~> 0.4) inherited_resources (~> 1.7) jquery-rails (~> 4.2) - kaminari (~> 1.0, >= 1.0.1) - railties (>= 5.2, < 6.1) - ransack (~> 2.1, >= 2.1.1) - sassc-rails (~> 2.1) - sprockets (>= 3.0, < 4.1) + kaminari (~> 1.0, >= 1.2.1) + railties (>= 6.0, < 7.1) + ransack (>= 2.1.1, < 4) activejob (6.0.3.5) activesupport (= 6.0.3.5) globalid (>= 0.3.6) @@ -94,9 +92,9 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - acts-as-taggable-on (6.5.0) - activerecord (>= 5.0, < 6.1) - acts_as_list (1.0.1) + acts-as-taggable-on (9.0.1) + activerecord (>= 6.0, < 7.1) + acts_as_list (1.0.4) activerecord (>= 4.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) @@ -175,16 +173,15 @@ GEM delayed_job (>= 3.0, < 5) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.7.2) + devise (4.7.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) + diff-lcs (1.5.0) equalizer (0.0.11) erubi (1.10.0) - erubis (2.7.0) exception_handler (0.3.45) execjs (2.7.0) factory_bot (6.1.0) @@ -210,29 +207,24 @@ GEM formtastic-bootstrap (3.1.1) formtastic (>= 3.0) formtastic_i18n (0.6.0) - friendly_id (5.4.0) + friendly_id (5.4.2) activerecord (>= 4.0.0) globalid (0.4.2) activesupport (>= 4.2.0) gravtastic (3.2.6) - haml (5.1.2) - temple (>= 0.8.0) + haml (6.0.7) + temple (>= 0.8.2) + thor tilt - haml-rails (2.0.1) + haml-rails (2.1.0) actionpack (>= 5.1) activesupport (>= 5.1) - haml (>= 4.0.6, < 6.0) - html2haml (>= 1.0.1) + haml (>= 4.0.6) railties (>= 5.1) - has_scope (0.7.2) - actionpack (>= 4.1) - activesupport (>= 4.1) + has_scope (0.8.0) + actionpack (>= 5.2) + activesupport (>= 5.2) hashie (4.1.0) - html2haml (2.2.0) - erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) i18n (1.8.2) concurrent-ruby (~> 1.0) ice_nine (0.11.2) @@ -242,14 +234,15 @@ GEM builder (>= 1.0, < 4.0) oauth (>= 0.4.5, < 0.6) inflecto (0.0.2) - inherited_resources (1.11.0) - actionpack (>= 5.0, < 6.1) + inherited_resources (1.13.1) + actionpack (>= 5.2, < 7.1) has_scope (~> 0.6) - railties (>= 5.0, < 6.1) + railties (>= 5.2, < 7.1) responders (>= 2, < 4) - jbuilder (2.10.0) + jbuilder (2.11.5) + actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.4.0) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -288,8 +281,8 @@ GEM nokogiri (~> 1) rake mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.4) + mini_portile2 (2.8.0) + minitest (5.16.3) momentjs-rails (2.20.1) railties (>= 3.1) multi_json (1.15.0) @@ -298,8 +291,9 @@ GEM mustache (1.1.1) mysql2 (0.5.3) nio4r (2.5.5) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) oauth (0.5.4) oauth2 (1.4.4) faraday (>= 0.8, < 2.0) @@ -334,7 +328,7 @@ GEM power_assert (1.2.0) progress_job (0.0.4) delayed_job - pry (0.13.1) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.5) @@ -342,6 +336,7 @@ GEM nio4r (~> 2.0) rabl (0.14.3) activesupport (>= 2.3.14) + racc (1.6.0) rack (2.2.2) rack-cors (1.1.1) rack (>= 2.0.0) @@ -383,7 +378,7 @@ GEM i18n polyamorous (= 2.3.2) rdoc (6.2.1) - redcarpet (3.5.0) + redcarpet (3.5.1) ref (2.0.0) remotipart (1.4.4) representable (3.0.4) @@ -397,7 +392,7 @@ GEM rexml (3.2.4) rspec-core (3.9.2) rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec-expectations (3.9.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) @@ -414,8 +409,6 @@ GEM rspec-support (3.9.3) ruby-graphviz (1.2.5) rexml - ruby_parser (3.14.2) - sexp_processor (~> 4.9) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.1.0) @@ -428,7 +421,6 @@ GEM tilt sdoc (1.1.0) rdoc (>= 5.0) - sexp_processor (4.15.0) simple_oauth (0.3.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) @@ -448,9 +440,9 @@ GEM thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - timers (4.3.0) + timers (4.3.5) truncate_html (0.9.3) - tzinfo (1.2.9) + tzinfo (1.2.10) thread_safe (~> 0.1) uber (0.1.0) uglifier (4.2.0) @@ -469,7 +461,7 @@ GEM websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) - zeitwerk (2.4.2) + zeitwerk (2.6.1) PLATFORMS ruby @@ -529,7 +521,7 @@ DEPENDENCIES mustache (~> 1.0) mysql2 net-ssh! - nokogiri (= 1.10.9) + nokogiri (= 1.13.9) oauth (= 0.5.4) oauth2 (= 1.4.4) omniauth