diff --git a/Gemfile b/Gemfile index 9b0512ad6a234..f054cb45e053c 100644 --- a/Gemfile +++ b/Gemfile @@ -84,7 +84,7 @@ gem "redis-rails", "~> 5.0.2" # Redis for Ruby on Rails gem "request_store", "~> 1.5" # RequestStore gives you per-request global storage gem "reverse_markdown", "~> 2.0" # Map simple html back into markdown gem "rolify", "~> 5.3" # Very simple Roles library -gem "rouge", "~> 3.25" # A pure-ruby code highlighter +gem "rouge", "~> 4.0" # A pure-ruby code highlighter gem "rubyzip", "~> 2.3" # Rubyzip is a ruby library for reading and writing zip files gem "s3_direct_upload", "~> 0.1" # Direct Upload to Amazon S3 gem "sassc-rails", "~> 2.1.2" # Integrate SassC-Ruby into Rails diff --git a/Gemfile.lock b/Gemfile.lock index 3f5909f4d43c2..5db520743fa4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM approvals (0.0.24) nokogiri (~> 1.6) thor (~> 0.18) - ast (2.4.1) + ast (2.4.2) aws-eventstream (1.1.0) aws-sigv4 (1.2.2) aws-eventstream (~> 1, >= 1.0.2) @@ -256,7 +256,7 @@ GEM tzinfo eventmachine (1.2.5) excon (0.78.1) - execjs (2.7.0) + execjs (2.8.1) exifr (1.3.9) factory_bot (6.1.0) activesupport (>= 5.0.0) @@ -284,7 +284,7 @@ GEM browser (>= 2.0) distribution railties (>= 5) - fix-db-schema-conflicts (3.0.3) + fix-db-schema-conflicts (3.1.0) rubocop (>= 0.38.0) flipper (0.19.1) flipper-active_record (0.19.0) @@ -410,7 +410,7 @@ GEM activerecord kaminari-core (= 1.2.1) kaminari-core (1.2.1) - katex (0.6.0) + katex (0.6.1) execjs (~> 2.7) knapsack_pro (2.10.1) rake @@ -446,7 +446,7 @@ GEM mini_portile2 (2.4.0) mini_racer (0.3.1) libv8 (~> 8.4.255) - minitest (5.14.2) + minitest (5.16.3) msgpack (1.3.3) multi_json (1.15.0) multi_xml (0.6.0) @@ -491,7 +491,7 @@ GEM rack orm_adapter (0.5.0) parallel (1.20.1) - parser (2.7.2.0) + parser (3.1.3.0) ast (~> 2.4.1) patron (0.13.3) pg (1.2.3) @@ -562,7 +562,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.1) ransack (2.4.0) activerecord (>= 5.2.4) @@ -604,9 +604,9 @@ GEM netrc (~> 0.8) reverse_markdown (2.0.0) nokogiri - rexml (3.2.4) + rexml (3.2.5) rolify (5.3.0) - rouge (3.25.0) + rouge (4.0.1) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -639,8 +639,8 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.2.0) - parser (>= 2.7.1.5) + rubocop-ast (1.24.0) + parser (>= 3.1.1.0) rubocop-performance (1.9.1) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -652,7 +652,7 @@ GEM rubocop (~> 0.87) rubocop-ast (>= 0.7.1) ruby-prof (1.4.2) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) ruby-statistics (2.1.2) ruby-vips (2.0.17) ffi (~> 1.9) @@ -764,7 +764,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) uniform_notifier (1.13.0) validate_url (1.0.13) activemodel (>= 3.0.0) @@ -920,7 +920,7 @@ DEPENDENCIES request_store (~> 1.5) reverse_markdown (~> 2.0) rolify (~> 5.3) - rouge (~> 3.25) + rouge (~> 4.0) rspec-rails (~> 4.0) rspec-retry (~> 0.6) rubocop (~> 0.93.1) diff --git a/vendor/cache/ast-2.4.1.gem b/vendor/cache/ast-2.4.1.gem deleted file mode 100644 index 01617aad96bd8..0000000000000 Binary files a/vendor/cache/ast-2.4.1.gem and /dev/null differ diff --git a/vendor/cache/ast-2.4.2.gem b/vendor/cache/ast-2.4.2.gem new file mode 100644 index 0000000000000..abe1643657c26 Binary files /dev/null and b/vendor/cache/ast-2.4.2.gem differ diff --git a/vendor/cache/execjs-2.7.0.gem b/vendor/cache/execjs-2.7.0.gem deleted file mode 100644 index 1247cce4575fb..0000000000000 Binary files a/vendor/cache/execjs-2.7.0.gem and /dev/null differ diff --git a/vendor/cache/execjs-2.8.1.gem b/vendor/cache/execjs-2.8.1.gem new file mode 100644 index 0000000000000..b8c2d2fc48986 Binary files /dev/null and b/vendor/cache/execjs-2.8.1.gem differ diff --git a/vendor/cache/fix-db-schema-conflicts-3.0.3.gem b/vendor/cache/fix-db-schema-conflicts-3.0.3.gem deleted file mode 100644 index 1b360dff9c8b3..0000000000000 Binary files a/vendor/cache/fix-db-schema-conflicts-3.0.3.gem and /dev/null differ diff --git a/vendor/cache/fix-db-schema-conflicts-3.1.0.gem b/vendor/cache/fix-db-schema-conflicts-3.1.0.gem new file mode 100644 index 0000000000000..d23cc2573beb9 Binary files /dev/null and b/vendor/cache/fix-db-schema-conflicts-3.1.0.gem differ diff --git a/vendor/cache/katex-0.6.0.gem b/vendor/cache/katex-0.6.0.gem deleted file mode 100644 index 3ca79ce187f93..0000000000000 Binary files a/vendor/cache/katex-0.6.0.gem and /dev/null differ diff --git a/vendor/cache/katex-0.6.1.gem b/vendor/cache/katex-0.6.1.gem new file mode 100644 index 0000000000000..905ad43539143 Binary files /dev/null and b/vendor/cache/katex-0.6.1.gem differ diff --git a/vendor/cache/libv8-8.4.255.0.gem b/vendor/cache/libv8-8.4.255.0.gem new file mode 100644 index 0000000000000..adf5a257e39d9 Binary files /dev/null and b/vendor/cache/libv8-8.4.255.0.gem differ diff --git a/vendor/cache/minitest-5.14.2.gem b/vendor/cache/minitest-5.14.2.gem deleted file mode 100644 index 66232f78f61da..0000000000000 Binary files a/vendor/cache/minitest-5.14.2.gem and /dev/null differ diff --git a/vendor/cache/minitest-5.16.3.gem b/vendor/cache/minitest-5.16.3.gem new file mode 100644 index 0000000000000..ebdb92e36c281 Binary files /dev/null and b/vendor/cache/minitest-5.16.3.gem differ diff --git a/vendor/cache/parser-2.7.2.0.gem b/vendor/cache/parser-2.7.2.0.gem deleted file mode 100644 index 66f82f1104f46..0000000000000 Binary files a/vendor/cache/parser-2.7.2.0.gem and /dev/null differ diff --git a/vendor/cache/parser-3.1.3.0.gem b/vendor/cache/parser-3.1.3.0.gem new file mode 100644 index 0000000000000..26ea6f0f3b1e0 Binary files /dev/null and b/vendor/cache/parser-3.1.3.0.gem differ diff --git a/vendor/cache/rainbow-3.0.0.gem b/vendor/cache/rainbow-3.0.0.gem deleted file mode 100644 index c53caf7afa806..0000000000000 Binary files a/vendor/cache/rainbow-3.0.0.gem and /dev/null differ diff --git a/vendor/cache/rainbow-3.1.1.gem b/vendor/cache/rainbow-3.1.1.gem new file mode 100644 index 0000000000000..863181a2e77bc Binary files /dev/null and b/vendor/cache/rainbow-3.1.1.gem differ diff --git a/vendor/cache/rexml-3.2.4.gem b/vendor/cache/rexml-3.2.4.gem deleted file mode 100644 index 95bedb1d8e92a..0000000000000 Binary files a/vendor/cache/rexml-3.2.4.gem and /dev/null differ diff --git a/vendor/cache/rexml-3.2.5.gem b/vendor/cache/rexml-3.2.5.gem new file mode 100644 index 0000000000000..5680fec4c6a6c Binary files /dev/null and b/vendor/cache/rexml-3.2.5.gem differ diff --git a/vendor/cache/rouge-3.25.0.gem b/vendor/cache/rouge-3.25.0.gem deleted file mode 100644 index 4301e275ed473..0000000000000 Binary files a/vendor/cache/rouge-3.25.0.gem and /dev/null differ diff --git a/vendor/cache/rouge-4.0.1.gem b/vendor/cache/rouge-4.0.1.gem new file mode 100644 index 0000000000000..b5f53f44cc3e8 Binary files /dev/null and b/vendor/cache/rouge-4.0.1.gem differ diff --git a/vendor/cache/rubocop-ast-1.2.0.gem b/vendor/cache/rubocop-ast-1.2.0.gem deleted file mode 100644 index 3796a2085104a..0000000000000 Binary files a/vendor/cache/rubocop-ast-1.2.0.gem and /dev/null differ diff --git a/vendor/cache/rubocop-ast-1.24.0.gem b/vendor/cache/rubocop-ast-1.24.0.gem new file mode 100644 index 0000000000000..04230d1846898 Binary files /dev/null and b/vendor/cache/rubocop-ast-1.24.0.gem differ diff --git a/vendor/cache/ruby-progressbar-1.10.1.gem b/vendor/cache/ruby-progressbar-1.10.1.gem deleted file mode 100644 index 519968f235bf9..0000000000000 Binary files a/vendor/cache/ruby-progressbar-1.10.1.gem and /dev/null differ diff --git a/vendor/cache/ruby-progressbar-1.11.0.gem b/vendor/cache/ruby-progressbar-1.11.0.gem new file mode 100644 index 0000000000000..a9d84e50bcf05 Binary files /dev/null and b/vendor/cache/ruby-progressbar-1.11.0.gem differ diff --git a/vendor/cache/unicode-display_width-1.7.0.gem b/vendor/cache/unicode-display_width-1.7.0.gem deleted file mode 100644 index 2f8a60d59b151..0000000000000 Binary files a/vendor/cache/unicode-display_width-1.7.0.gem and /dev/null differ diff --git a/vendor/cache/unicode-display_width-1.8.0.gem b/vendor/cache/unicode-display_width-1.8.0.gem new file mode 100644 index 0000000000000..75166d4d2a3a7 Binary files /dev/null and b/vendor/cache/unicode-display_width-1.8.0.gem differ