diff --git a/Gemfile b/Gemfile index 45dc4dfebed53..03ca368284589 100644 --- a/Gemfile +++ b/Gemfile @@ -168,7 +168,7 @@ gem 'asciidoctor-kroki', '~> 0.5.0', require: false gem 'rouge', '~> 3.26.1' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.11.4' +gem 'nokogiri', '~> 1.13.9' gem 'escape_utils', '~> 1.1' # Calendar rendering diff --git a/Gemfile.lock b/Gemfile.lock index fc13e8d6ecccb..1a1e0d1b0ae86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,8 +9,9 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.3.2) - acme-client (2.0.6) - faraday (>= 0.17, < 2.0.0) + acme-client (2.0.11) + faraday (>= 1.0, < 3.0.0) + faraday-retry (~> 1.0) actioncable (6.1.4.1) actionpack (= 6.1.4.1) activesupport (= 6.1.4.1) @@ -83,11 +84,11 @@ GEM apollo_upload_server (2.1.0) actionpack (>= 4.2) graphql (>= 1.8) - asana (0.10.3) + asana (0.10.13) faraday (~> 1.0) faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.4) + oauth2 (>= 1.4, < 3) asciidoctor (2.0.15) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) @@ -124,14 +125,14 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.2.1) aws-eventstream (~> 1, >= 1.0.2) - azure-storage-blob (2.0.1) + azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) - nokogiri (~> 1.11.0.rc2) - azure-storage-common (2.0.2) + nokogiri (~> 1, >= 1.10.8) + azure-storage-common (2.0.4) faraday (~> 1.0) - faraday_middleware (~> 1.0.0.rc1) + faraday_middleware (~> 1.0, >= 1.0.0.rc1) net-http-persistent (~> 4.0) - nokogiri (~> 1.11.0.rc2) + nokogiri (~> 1, >= 1.10.8) babosa (1.0.4) backport (1.2.0) base32 (0.3.2) @@ -148,7 +149,7 @@ GEM rack (>= 0.9.0) bindata (2.4.10) binding_ninja (0.2.3) - bootsnap (1.4.6) + bootsnap (1.4.9) msgpack (~> 1.0) bootstrap_form (4.2.0) actionpack (>= 5.0) @@ -170,7 +171,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - capybara-screenshot (1.0.22) + capybara-screenshot (1.0.26) capybara (>= 1.0, < 4) launchy carrierwave (1.3.2) @@ -200,7 +201,7 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.23.2) + commonmarker (0.23.6) concurrent-ruby (1.1.9) connection_pool (2.2.2) contracts (0.11.0) @@ -222,7 +223,7 @@ GEM css_parser (1.7.0) addressable daemons (1.3.1) - danger (8.3.1) + danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -239,6 +240,7 @@ GEM danger gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) + dead_end (4.0.0) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.3.1) html-pipeline @@ -249,13 +251,15 @@ GEM activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) - derailed_benchmarks (1.8.1) + derailed_benchmarks (2.1.2) benchmark-ips (~> 2) + dead_end get_process_mem (~> 0) heapy (~> 0) - memory_profiler (~> 0) - mini_histogram (>= 0.2.1) + memory_profiler (>= 0, < 2) + mini_histogram (>= 0.3.0) rack (>= 1) + rack-test rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) @@ -272,7 +276,7 @@ GEM devise (~> 4.0) railties (< 6.2) rotp (~> 6.0) - diff-lcs (1.4.4) + diff-lcs (1.5.0) diff_match_patch (0.1.0) diffy (3.3.0) discordrb-webhooks (3.4.2) @@ -344,13 +348,17 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.4.2) + faraday (1.10.2) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) @@ -360,9 +368,15 @@ GEM faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.1.0) - faraday_middleware (1.0.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (0.3.0) aws-sigv4 (~> 1.0) @@ -394,11 +408,10 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.12.0) + fog-aws (3.15.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - ipaddress (~> 0.8) fog-core (2.1.0) builder excon (~> 0.58) @@ -424,7 +437,7 @@ GEM fog-json (>= 1.0) fog-xml (>= 0.1) ipaddress (>= 0.8) - fog-xml (0.1.3) + fog-xml (0.1.4) fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) @@ -445,12 +458,13 @@ GEM text (>= 1.3.0) gettext_i18n_rails (1.8.0) fast_gettext (>= 0.9.0) - gettext_i18n_rails_js (1.3.0) + gettext_i18n_rails_js (1.3.1) gettext (>= 3.0.2) gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - git (1.7.0) + git (1.12.0) + addressable (~> 2.8) rchardet (~> 1.8) gitaly (14.3.0.pre.rc2) grpc (~> 1.0) @@ -460,7 +474,7 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.3.0) + gitlab-dangerfiles (2.3.2) danger (>= 8.3.1) danger-gitlab (>= 8.0.0) gitlab-experiment (0.6.4) @@ -521,8 +535,8 @@ GEM retriable (>= 2.0, < 4.0) rexml signet (~> 0.12) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) google-protobuf (3.17.3) googleapis-common-protos-types (1.1.0) google-protobuf (~> 3.14) @@ -542,10 +556,10 @@ GEM mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - grape-entity (0.10.0) + grape-entity (0.10.2) activesupport (>= 3.0.0) multi_json (>= 1.3.2) - grape-path-helpers (1.7.0) + grape-path-helpers (1.7.1) activesupport grape (~> 1.3) rake (> 12) @@ -553,7 +567,7 @@ GEM grape_logging (1.8.3) grape rack - graphiql-rails (1.4.10) + graphiql-rails (1.4.11) railties sprockets-rails graphlient (0.4.0) @@ -564,26 +578,26 @@ GEM graphql-client (0.16.0) activesupport (>= 3.0) graphql (~> 1.8) - graphql-docs (1.6.0) + graphql-docs (1.6.1) commonmarker (~> 0.16) escape_utils (~> 1.2) extended-markdown-filter (~> 0.4) gemoji (~> 3.0) graphql (~> 1.6) - html-pipeline (~> 2.8) + html-pipeline (~> 2.9) sass (~> 3.4) grpc (1.30.2) google-protobuf (~> 3.12) googleapis-common-protos-types (~> 1.0) - gssapi (1.2.0) + gssapi (1.3.1) ffi (>= 1.0.1) - guard (2.16.2) + guard (2.18.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) - pry (>= 0.9.12) + pry (>= 0.13.0) shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) @@ -600,7 +614,7 @@ GEM rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.15.0) + hamlit (2.15.2) temple (>= 0.8.2) thor tilt @@ -617,7 +631,7 @@ GEM html-pipeline (2.13.2) activesupport (>= 2) nokogiri (>= 1.4) - html2text (0.2.0) + html2text (0.2.1) nokogiri (~> 1.6) htmlentities (4.3.4) http (4.4.1) @@ -638,7 +652,9 @@ GEM i18n (1.8.10) concurrent-ruby (~> 1.0) i18n_data (0.8.0) - icalendar (2.4.1) + icalendar (2.8.0) + ice_cube (~> 0.16) + ice_cube (0.16.4) invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) @@ -704,13 +720,13 @@ GEM letter_opener (~> 1.0) railties (>= 3.2) libyajl2 (1.2.0) - license_finder (6.0.0) + license_finder (6.15.0) bundler rubyzip (>= 1, < 3) - thor - toml (= 0.2.0) + thor (~> 1.0.1) + tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) - xml-simple + xml-simple (~> 1.1.5) licensee (9.14.1) dotenv (~> 2.0) octokit (~> 4.17) @@ -727,7 +743,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.12.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -735,7 +751,7 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.1) - marginalia (1.10.0) + marginalia (1.10.1) actionpack (>= 2.3) activerecord (>= 2.3) memoist (0.16.2) @@ -747,7 +763,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.1.1) - mini_portile2 (2.5.3) + mini_portile2 (2.8.0) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -779,33 +795,37 @@ GEM connection_pool (~> 2.2) net-ldap (0.16.3) net-ntp (2.1.3) + net-protocol (0.1.3) + timeout net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) + net-smtp (0.3.2) + net-protocol net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogumbo (2.0.2) + nokogumbo (2.0.5) nokogiri (~> 1.8, >= 1.8.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) numerizer (0.2.0) oauth (0.5.6) - oauth2 (1.4.7) - faraday (>= 0.8, < 2.0) + oauth2 (1.4.11) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - octokit (4.20.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - ohai (16.10.6) - chef-config (>= 12.8, < 17) + rack (>= 1.2, < 4) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + ohai (16.17.0) + chef-config (>= 14.12, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -813,12 +833,12 @@ GEM mixlib-cli (>= 1.7.0) mixlib-config (>= 2.0, < 4.0) mixlib-log (>= 2.0.1, < 4.0) - mixlib-shellout (>= 2.0, < 4.0) + mixlib-shellout (~> 3.2, >= 3.2.5) plist (~> 3.1) train-core wmi-lite (~> 1.0) oj (3.10.6) - omniauth (1.9.1) + omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-atlassian-oauth2 (0.2.0) @@ -847,7 +867,7 @@ GEM omniauth-gitlab (1.0.3) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.6.0) + omniauth-google-oauth2 (0.6.1) jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) @@ -859,17 +879,17 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.7.1) - oauth2 (~> 1.4) + omniauth-oauth2 (1.7.3) + oauth2 (>= 1.4, < 3) omniauth (>= 1.9, < 3) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) omniauth-salesforce (1.0.5) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-saml (1.10.0) + omniauth-saml (1.10.3) omniauth (~> 1.3, >= 1.3.2) - ruby-saml (~> 1.7) + ruby-saml (~> 1.9) omniauth-shibboleth (1.3.0) omniauth (>= 1.0.0) omniauth-twitter (1.4.0) @@ -880,10 +900,11 @@ GEM nokogiri (>= 1.4.4) omniauth (~> 1.0) open4 (1.3.4) - openid_connect (1.2.0) + openid_connect (1.3.1) activemodel attr_required (>= 1.0.0) json-jwt (>= 1.5.0) + net-smtp rack-oauth2 (>= 1.6.1) swd (>= 1.0.0) tzinfo @@ -906,7 +927,7 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.2.3) + pg (1.4.4) pg_query (2.1.0) google-protobuf (>= 3.17.1) plist (3.6.0) @@ -945,7 +966,7 @@ GEM puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) rack-accept (0.4.5) rack (>= 0.4) @@ -1035,7 +1056,7 @@ GEM uber (< 0.2.0) request_store (1.5.0) rack (>= 1.4) - responders (3.0.0) + responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) rest-client (2.1.0) @@ -1115,8 +1136,8 @@ GEM rubocop-ast (>= 0.7.1) ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-magic (0.4.0) - mini_portile2 (~> 2.5.0) + ruby-magic (0.5.4) + mini_portile2 (~> 2.6) ruby-prof (1.3.1) ruby-progressbar (1.11.0) ruby-saml (1.13.0) @@ -1124,16 +1145,16 @@ GEM rexml ruby-statistics (2.1.2) ruby2_keywords (0.0.4) - ruby_parser (3.15.0) - sexp_processor (~> 4.9) - rubyntlm (0.6.2) - rubypants (0.2.0) + ruby_parser (3.19.1) + sexp_processor (~> 4.16) + rubyntlm (0.6.3) + rubypants (0.7.1) rubyzip (2.0.0) rugged (1.1.0) safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) - sanitize (5.2.1) + sanitize (5.2.3) crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) @@ -1142,18 +1163,17 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.0.1) + sassc (2.4.0) ffi (~> 1.9) - rake - sassc-rails (2.1.0) + sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) sprockets (> 3.0) sprockets-rails tilt - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) scientist (1.6.0) securecompare (1.0.0) seed-fu (2.3.7) @@ -1166,7 +1186,7 @@ GEM faraday (>= 1.0) set (1.0.1) settingslogic (2.0.9) - sexp_processor (4.15.1) + sexp_processor (4.16.1) shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) @@ -1174,8 +1194,8 @@ GEM connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) - sidekiq-cron (1.0.4) - fugit (~> 1.1) + sidekiq-cron (1.8.0) + fugit (~> 1) sidekiq (>= 4.2.1) signet (0.14.0) addressable (~> 2.3) @@ -1189,11 +1209,13 @@ GEM simplecov-cobertura (1.3.1) simplecov (~> 0.8) simplecov-html (0.12.3) + simpleidn (0.2.1) + unf (~> 0.1.4) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) - solargraph (0.43.0) + solargraph (0.47.2) backport (~> 1.2) benchmark bundler (>= 1.17.2) @@ -1219,9 +1241,9 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.3.13) sshkey (2.0.0) @@ -1255,18 +1277,17 @@ GEM test_file_finder (0.1.4) faraday (~> 1.0) text (1.3.1) - thin (1.8.0) + thin (1.8.1) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.1.0) + thor (1.0.1) thrift (0.14.0) tilt (2.0.10) - timecop (0.9.1) + timecop (0.9.5) timeliness (0.3.10) + timeout (0.3.0) timfel-krb5-auth (0.8.3) - toml (0.2.0) - parslet (~> 1.8.0) toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) @@ -1280,7 +1301,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 7.0) - truncato (0.7.11) + truncato (0.7.12) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) tty-color (0.6.0) @@ -1310,19 +1331,20 @@ GEM unicode-display_width (1.7.0) unicode_utils (1.4.0) uniform_notifier (1.13.0) - unleash (3.2.2) + unleash (3.2.5) murmurhash3 (~> 0.1.6) unparser (0.6.0) diff-lcs (~> 1.3) parser (>= 3.0.0) uri_template (0.7.0) - valid_email (0.1.3) + valid_email (0.1.4) activemodel mail (>= 2.6.1) + simpleidn validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) - validate_url (1.0.13) + validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix validates_hostname (1.0.11) @@ -1364,9 +1386,9 @@ GEM xml-simple (1.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yajl-ruby (1.4.1) + yajl-ruby (1.4.3) yard (0.9.26) - zeitwerk (2.4.2) + zeitwerk (2.6.1) PLATFORMS ruby @@ -1530,7 +1552,7 @@ DEPENDENCIES net-ldap (~> 0.16.3) net-ntp net-ssh (~> 6.0) - nokogiri (~> 1.11.4) + nokogiri (~> 1.13.9) oauth2 (~> 1.4) octokit (~> 4.15) ohai (~> 16.10)