summaryrefslogtreecommitdiff
path: root/www/gitlab/files/patch-Gemfile
blob: c5e64b7593607afaeffa9e708bf4ec61b04ea457 (plain) (blame)
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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
--- Gemfile.orig	2025-10-21 19:24:47 UTC
+++ Gemfile
@@ -165,7 +165,7 @@ gem 'graphql', '2.5.11', feature_category: :api
 
 # GraphQL API
 gem 'graphql', '2.5.11', feature_category: :api
-gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
+#gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
 gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
 
 # Cells
@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
 gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
 
 # Background jobs
-gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability
+gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability
 gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
 gem 'gitlab-sidekiq-fetcher',
   path: 'vendor/gems/sidekiq-reliable-fetch',
@@ -473,141 +473,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
 
 gem 'warning', '~> 1.5.0', feature_category: :shared
 
-group :development do
-  gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling
-  gem 'rubocop', feature_category: :tooling, require: false
-  gem 'debug', '~> 1.11.0', feature_category: :shared
-
-  gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared
-  gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared
-
-  gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared
-  gem 'lookbook', '~> 2.3', feature_category: :shared
-
-  # Better errors handler
-  gem 'better_errors', '~> 2.10.1', feature_category: :shared
-
-  gem 'sprite-factory', '~> 1.7', feature_category: :shared
-
-  gem 'listen', '~> 3.7', feature_category: :shared
-
-  gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling
-
-  gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling
-
-  gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
-
-  gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling
-
-  # Used by
-  # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake`
-  # * `lib/tasks/gitlab/db/migration_squash.rake`
-  gem 'git', '~> 1.8', feature_category: :shared
-end
-
-group :development, :test do
-  gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
-  gem 'bullet', '~> 8.0.0', feature_category: :shared
-  gem 'parser', '= 3.3.9.0', feature_category: :shared
-  gem 'pry-byebug', feature_category: :shared
-  gem 'pry-rails', '~> 0.3.9', feature_category: :shared
-  gem 'pry-shell', '~> 0.6.4', feature_category: :shared
-
-  gem 'awesome_print', require: false, feature_category: :shared
-
-  gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
-  gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
-  gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling
-
-  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 5.11.0', feature_category: :shared
-
-  gem 'spring', '~> 4.3.0', feature_category: :shared
-  gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared
-
-  gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false
-  gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false
-
-  # Benchmarking & profiling
-  gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared
-  gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared
-
-  gem 'knapsack', '~> 4.0.0', feature_category: :tooling
-  gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling
-  gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
-
-  gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared
-
-  gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared
-
-  gem 'parallel', '~> 1.19', require: false, feature_category: :shared
-
-  gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared
-
-  gem 'pact', '~> 1.64', feature_category: :shared
-
-  gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
-
-  gem 'yard', '~> 0.9', require: false, feature_category: :tooling
-end
-
 group :development, :test, :danger do
   gem 'gitlab-dangerfiles', '~> 4.10.0', require: false, feature_category: :tooling
 end
 
-group :development, :test, :coverage do
-  gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
-  gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
-  gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling
-  gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling
-end
-
 # Gems required in omnibus-gitlab pipeline
 group :development, :test, :omnibus do
   gem 'license_finder', '~> 7.0', require: false, feature_category: :shared
 end
 
-# Gems required in various pipelines
-group :development, :test, :monorepo do
-  gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared
-  gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
-end
-
-group :test do
-  gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling
-  gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling
-  gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
-  gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling
-  gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling
-
-  gem 'capybara', '~> 3.40', feature_category: :test_platform
-  gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform
-  gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform
-
-  gem 'graphlyte', '~> 1.0.0', feature_category: :shared
-
-  # Upload CI metrics to a GCP BigQuery instance
-  #
-  # We only use this gem in CI.
-  gem 'google-cloud-bigquery', '~> 1.0', feature_category: :tooling
-
-  gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared
-  gem 'email_spec', '~> 2.3.0', feature_category: :shared
-  gem 'webmock', '~> 3.25.0', feature_category: :shared
-  gem 'rails-controller-testing', feature_category: :shared
-  gem 'concurrent-ruby', '~> 1.1', feature_category: :shared
-  gem 'test-prof', '~> 1.4.0', feature_category: :tooling
-  gem 'rspec_junit_formatter', feature_category: :shared
-  gem 'guard-rspec', feature_category: :shared
-  gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling
-  gem 'state_machines-rspec', '~> 0.6', feature_category: :shared
-
-  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
-  gem 'derailed_benchmarks', require: false, feature_category: :shared
-
-  gem 'gitlab_quality-test_tooling', '~> 2.20.0', require: false, feature_category: :tooling
-end
-
 gem 'octokit', '~> 9.0', feature_category: :importers
 # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
 gem 'faraday-multipart', '~> 1.0', feature_category: :importers
@@ -641,10 +515,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
 gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly
+gem 'gitaly', '~> 18.4', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
-gem 'gitlab-kas-grpc', '~> 18.3.0', feature_category: :deployment_management
+gem 'gitlab-kas-grpc', '~> 18.3', feature_category: :deployment_management
 
 gem 'grpc', '~> 1.74.0', feature_category: :shared
 
@@ -667,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
 gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared
 
 # Countries list
-gem 'countries', '~> 4.0.0', feature_category: :shared
+gem 'countries', '~> 4.0', feature_category: :shared
 
 gem 'retriable', '~> 3.1.2', feature_category: :shared
 
@@ -752,10 +626,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
 
 gem 'duo_api', '~> 1.3', feature_category: :system_access
 
+gem 'parser'
+gem 'net-smtp'
+gem 'net-pop'
+gem 'psych', '~> 3.1'
+
 gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation
 
 gem 'paper_trail', '~> 16.0', feature_category: :shared
 
-gem "i18n_data", "~> 0.13.1", feature_category: :system_access
+gem "i18n_data", "~> 0.13", feature_category: :system_access
 
 gem "gitlab-cloud-connector", "~> 1.26", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning