diff options
author | Toon Claes <toon@gitlab.com> | 2023-02-02 11:22:42 +0300 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2023-02-07 08:50:14 +0300 |
commit | 2a396ef53ad178da8c5b69042a2c24d1a6445476 (patch) | |
tree | ed2d9ec87107976dcf5a21767b0027a12df43a50 /ruby | |
parent | 262934399fb3f6f7b6cc610c1bff40427b8a12dc (diff) |
ruby: Match gem versions of gitlab-org/gitlab
To reduce the number of gem installed in a complete GitLab installation
it's nice to have all components use the same gem versions. This change
changes the currently mismatches versions with those of
gitlab-org/gitlab.
As an added benefit, this effort ensures all gems are compatible with
Ruby 3, as gitlab-org/gitlab updated all gems in [1].
[1]: https://gitlab.com/groups/gitlab-org/-/epics/6210
Diffstat (limited to 'ruby')
-rw-r--r-- | ruby/Gemfile | 8 | ||||
-rw-r--r-- | ruby/Gemfile.lock | 44 |
2 files changed, 26 insertions, 26 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index ddbfe5f8b..d96e63b9f 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,10 +1,10 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.5.1' -gem 'gitlab-markup', '~> 1.7.1' +gem 'gitlab-markup', '~> 1.8.0' gem 'activesupport', '~> 6.1.7.2' gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem -gem 'sentry-raven', '~> 3.0', require: false +gem 'sentry-raven', '~> 3.1', require: false gem 'rbtrace', require: false # The Gitaly Gem contains the Protobuf and gRPC definitions required by the @@ -28,10 +28,10 @@ gem 'redis', '~> 4.8.0' group :development, :test do gem 'rubocop', '~> 1.38', require: false - gem 'rspec', require: false + gem 'rspec', '~> 3.12.0', require: false gem 'rspec-parameterized', require: false gem 'factory_bot', require: false - gem 'pry', '~> 0.12.2', require: false + gem 'pry', '~> 0.13.1', require: false end # Gems required in omnibus-gitlab pipeline diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 176e8d654..7cbfe6afd 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -55,7 +55,7 @@ GEM tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) xml-simple (~> 1.1.5) - gitlab-markup (1.7.1) + gitlab-markup (1.8.1) google-protobuf (3.21.12) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) @@ -77,7 +77,7 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - method_source (0.9.2) + method_source (1.0.0) mini_portile2 (2.8.1) minitest (5.17.0) msgpack (1.3.3) @@ -99,12 +99,12 @@ GEM coderay parser unparser - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) public_suffix (4.0.7) racc (1.6.2) - rack (2.2.4) + rack (2.2.6.2) rack-test (2.0.2) rack (>= 1.3) rails-dom-testing (2.0.3) @@ -122,18 +122,18 @@ GEM reverse_markdown (1.4.0) nokogiri rexml (3.2.5) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + 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.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) + rspec-support (~> 3.12.0) rspec-parameterized (1.0.0) rspec-parameterized-core (< 2) rspec-parameterized-table_syntax (< 2) @@ -145,7 +145,7 @@ GEM rspec-parameterized-table_syntax (1.0.0) binding_of_caller rspec-parameterized-core (< 2) - rspec-support (3.8.0) + rspec-support (3.12.0) rubocop (1.44.0) json (~> 2.3) parallel (~> 1.10) @@ -164,7 +164,7 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - sentry-raven (3.0.4) + sentry-raven (3.1.2) faraday (>= 1.0) thor (1.1.0) thrift (0.17.0) @@ -189,19 +189,19 @@ DEPENDENCIES gitaly (~> 15.5.0) gitlab-labkit (~> 0.29) gitlab-license_finder - gitlab-markup (~> 1.7.1) + gitlab-markup (~> 1.8.0) google-protobuf (~> 3.21.12) grpc (~> 1.42.0) licensee (~> 9.15) nokogiri (~> 1.14) - pry (~> 0.12.2) + pry (~> 0.13.1) rbtrace redis (~> 4.8.0) - rspec + rspec (~> 3.12.0) rspec-parameterized rubocop (~> 1.38) rugged (~> 1.5.1) - sentry-raven (~> 3.0) + sentry-raven (~> 3.1) BUNDLED WITH 2.3.26 |