1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- ruby/Gemfile.orig 2022-11-11 19:21:41 UTC
+++ ruby/Gemfile
@@ -1,15 +1,15 @@
source 'https://rubygems.org'
gem 'rugged', '~> 1.2'
-gem 'github-linguist', '~> 7.20.0', require: 'linguist'
-gem 'gitlab-markup', '~> 1.7.1'
-gem 'activesupport', '~> 6.1.6.1'
+gem 'github-linguist', '~> 7.23.0', require: 'linguist'
+gem 'gitlab-markup', '~> 1.8.0'
+gem 'activesupport', '~> 6.1.6'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools
gem 'sentry-raven', '~> 3.0', require: false
-gem 'faraday', '~> 1.0'
+gem 'faraday', '~> 1.10.2'
gem 'rbtrace', require: false
# The Gitaly Gem contains the Protobuf and gRPC definitions required by the
@@ -28,21 +28,12 @@ gem 'google-protobuf', '~> 3.21.7'
# Rails is currently blocked on the upgrade to the new major version for Redis,
# so we don't upgrade either until the issue is resolved. This is an indirect
# dependency and can thus be removed when the version constraint is gone.
-gem 'redis', '~> 4.7.1'
+gem 'redis', '~> 4.7'
-group :development, :test do
- gem 'rubocop', '~> 0.69', require: false
- gem 'rspec', require: false
- gem 'rspec-parameterized', require: false
- gem 'timecop', require: false
- gem 'factory_bot', require: false
- gem 'pry', '~> 0.12.2', require: false
-end
-
# Gems required in omnibus-gitlab pipeline
group :development, :test, :omnibus do
# Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
# resolved. For details, check discussion in
# https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881
- gem 'gitlab-license_finder', require: false
+ gem 'license_finder', require: false
end
|
