diff options
author | Sarah German <sgerman@gitlab.com> | 2023-01-25 03:19:17 +0300 |
---|---|---|
committer | Sarah German <sgerman@gitlab.com> | 2023-01-25 03:19:17 +0300 |
commit | 911830a6ab2fd270880afef8f4735f31b6974bc8 (patch) | |
tree | dec8c879fc5aaa9ea43d3919cba7f9fd0de7ea61 | |
parent | 8a6311da917e0719bcc4e4ad9a7b3d1e49358e0e (diff) | |
parent | 5d9228506f716f03f2af1c40c935b713bec7f61e (diff) |
Merge branch 'eread/install-webrick-gem-for-ruby-3-compatibility' into 'main'
Install webrick gem for Ruby 3.x compatibility
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3476
Merged-by: Sarah German <sgerman@gitlab.com>
Approved-by: Sarah German <sgerman@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 44 |
2 files changed, 24 insertions, 21 deletions
@@ -27,6 +27,7 @@ group :test, :development do gem 'simplecov-cobertura', '~> 2.1.0', require: false gem 'pry-byebug', '~> 3.10.1', require: false gem 'gitlab-styles', '~> 9.2.0', require: false + gem "webrick", "~> 1.7" end group :development, :danger do diff --git a/Gemfile.lock b/Gemfile.lock index 70cadde4..ece20fcd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4) + activesupport (7.0.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -32,7 +32,7 @@ GEM coderay (1.1.3) colored (1.2) colored2 (3.1.2) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) cork (0.3.0) colored2 (~> 3.1) cri (2.15.11) @@ -124,14 +124,14 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - listen (3.7.1) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) memo_wise (1.7.0) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) + mini_portile2 (2.8.1) + minitest (5.17.0) multi_xml (0.6.0) multipart-post (2.2.3) nanoc (4.12.14) @@ -174,7 +174,7 @@ GEM nanoc-core (~> 4.11, >= 4.11.14) nap (1.1.0) no_proxy_fix (0.1.2) - nokogiri (1.13.9) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (5.6.1) @@ -182,7 +182,7 @@ GEM sawyer (~> 0.9) open4 (1.3.4) parallel (1.22.1) - parser (3.1.3.0) + parser (3.2.0.0) ast (~> 2.4.1) pastel (0.8.0) tty-color (~> 0.5) @@ -190,7 +190,7 @@ GEM coderay parser unparser - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.10.1) @@ -199,8 +199,8 @@ GEM psych (4.0.6) stringio public_suffix (5.0.1) - racc (1.6.0) - rack (2.2.4) + racc (1.6.2) + rack (2.2.6.2) rack-livereload (0.3.17) rack rainbow (3.1.1) @@ -209,19 +209,19 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rchardet (1.8.0) - regexp_parser (2.6.1) + regexp_parser (2.6.2) rexml (3.2.5) - rouge (4.0.0) + rouge (4.0.1) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) rspec-core (3.12.0) rspec-support (~> 3.12.0) - rspec-expectations (3.12.1) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.1) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-parameterized (1.0.0) @@ -246,11 +246,11 @@ GEM rubocop-ast (>= 1.23.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.24.0) + rubocop-ast (1.24.1) parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.18.0) + rubocop-graphql (0.19.0) rubocop (>= 0.87, < 2) rubocop-performance (1.15.2) rubocop (>= 1.7.0, < 2.0) @@ -259,7 +259,7 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.16.0) + rubocop-rspec (2.17.1) rubocop (~> 1.33) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -283,7 +283,7 @@ GEM simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) slow_enumerator_tools (1.1.0) - stringio (3.0.2) + stringio (3.0.4) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tty-color (0.6.0) @@ -294,9 +294,10 @@ GEM tzinfo (2.0.5) concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) - unparser (0.6.5) + unparser (0.6.7) diff-lcs (~> 1.3) - parser (>= 3.1.0) + parser (>= 3.2.0) + webrick (1.7.0) zeitwerk (2.6.6) PLATFORMS @@ -318,6 +319,7 @@ DEPENDENCIES sassc (~> 2.4.0) simplecov (~> 0.22.0) simplecov-cobertura (~> 2.1.0) + webrick (~> 1.7) BUNDLED WITH - 2.4.4 + 2.4.5 |