Skip to content

Commit 27a5a19

Browse files
leona-yayayayayaka
authored andcommitted
1 parent ca139fa commit 27a5a19

File tree

9 files changed

+237
-243
lines changed

9 files changed

+237
-243
lines changed
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "17.9.3",
3-
"repo_hash": "1g6j3yrb0hslz2p9fnby0801dn0nyi2mh6gygzkmrh5kj15vjbgd",
4-
"yarn_hash": "1bvv79jr6d9p33h81mc0miwc7rw3irblmcqbig8ikpb589kr09yv",
2+
"version": "17.10.1",
3+
"repo_hash": "1bxkfn49dih3i3z6z1l5xx5hrvrxwwr1ag66aw4vmncw4vyxl2wj",
4+
"yarn_hash": "0fw84hf9qswajmjhds59fn6l6xmyha6vja13dvb5slfw9cmbq9pi",
55
"owner": "gitlab-org",
66
"repo": "gitlab",
7-
"rev": "v17.9.3-ee",
7+
"rev": "v17.10.1-ee",
88
"passthru": {
9-
"GITALY_SERVER_VERSION": "17.9.3",
10-
"GITLAB_PAGES_VERSION": "17.9.3",
11-
"GITLAB_SHELL_VERSION": "14.40.0",
9+
"GITALY_SERVER_VERSION": "17.10.1",
10+
"GITLAB_PAGES_VERSION": "17.10.1",
11+
"GITLAB_SHELL_VERSION": "14.41.0",
1212
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0",
13-
"GITLAB_WORKHORSE_VERSION": "17.9.3"
13+
"GITLAB_WORKHORSE_VERSION": "17.10.1"
1414
}
1515
}

pkgs/applications/version-management/gitlab/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ let
8282
cp Cargo.lock $out
8383
'';
8484
};
85-
hash = "sha256-LpuQMV112Z5lspSK4M0IYdkxO8oVmucnJtqF2Y3+aNU=";
85+
hash = "sha256-VJR3F+6l8nYj1ZCHOWxnX82C68giXX45RkhIVpZvRLo=";
8686
};
8787

8888
dontBuild = false;

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ in
55
buildGoModule rec {
66
pname = "gitlab-workhorse";
77

8-
version = "17.9.3";
8+
version = "17.10.1";
99

1010
# nixpkgs-update: no auto update
1111
src = fetchFromGitLab {
@@ -17,7 +17,7 @@ buildGoModule rec {
1717

1818
sourceRoot = "${src.name}/workhorse";
1919

20-
vendorHash = "sha256-nqsZ0ac5NG2hCXgaJKd9J3AphzCHxF1eJ9Iypda9Uh0=";
20+
vendorHash = "sha256-b8HLad4oK5x7uzlr1SQAZt20+OhB3iswhpIQnk4VF/o=";
2121
buildInputs = [ git ];
2222
ldflags = [ "-X main.Version=${version}" ];
2323
doCheck = false;

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
3030
# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails
3131

3232
if next?
33-
gem 'rails', '~> 7.1.5', feature_category: :shared
33+
gem 'rails', '~> 7.1.5.1', feature_category: :shared
3434
else
3535
gem 'rails', '~> 7.0.8.7', feature_category: :shared
3636
end
@@ -76,7 +76,7 @@ gem 'rugged', '~> 1.6', feature_category: :gitaly
7676
gem 'faraday', '~> 2', feature_category: :shared
7777
gem 'faraday-retry', '~> 2', feature_category: :shared
7878
# Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef.
79-
gem 'logger', '~> 1.5.3', feature_category: :shared
79+
gem 'logger', '~> 1.6.0', feature_category: :shared
8080

8181
gem 'marginalia', '~> 1.11.1', feature_category: :database
8282

@@ -158,8 +158,8 @@ gem 'net-ldap', '~> 0.17.1', feature_category: :system_access
158158
# API
159159
gem 'grape', '~> 2.0.0', feature_category: :api
160160
gem 'grape-entity', '~> 1.0.1', feature_category: :api
161-
gem 'grape-swagger', '~> 2.1.0', group: [:development, :test], feature_category: :api
162-
gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api
161+
gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category: :api
162+
gem 'grape-swagger-entity', '~> 0.5.5', group: [:development, :test], feature_category: :api
163163
gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
164164
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
165165

@@ -253,7 +253,7 @@ gem 'gitlab-active-context', path: 'gems/gitlab-active-context', require: 'activ
253253
# Markdown and HTML processing
254254
gem 'html-pipeline', '~> 2.14.3', feature_category: :markdown
255255
gem 'deckar01-task_list', '2.3.4', feature_category: :markdown
256-
gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup', feature_category: :markdown
256+
gem 'gitlab-markup', '~> 2.0.0', require: 'github/markup', feature_category: :markdown
257257
gem 'commonmarker', '~> 0.23.10', feature_category: :markdown
258258
gem 'kramdown', '~> 2.5.0', feature_category: :markdown
259259
gem 'RedCloth', '~> 4.3.3', feature_category: :markdown
@@ -267,7 +267,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdow
267267
gem 'rouge', '~> 4.5.0', feature_category: :shared
268268
gem 'truncato', '~> 0.7.13', feature_category: :team_planning
269269
gem 'nokogiri', '~> 1.18', feature_category: :shared
270-
gem 'gitlab-glfm-markdown', '~> 0.0.21', feature_category: :markdown
270+
gem 'gitlab-glfm-markdown', '~> 0.0.27', feature_category: :markdown
271271
gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
272272
gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
273273

@@ -303,7 +303,7 @@ gem 'gitlab-sidekiq-fetcher',
303303
gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration
304304

305305
# HTTP requests
306-
gem 'httparty', '~> 0.21.0', feature_category: :shared
306+
gem 'httparty', '~> 0.22.0', feature_category: :shared
307307

308308
# Colored output to console
309309
gem 'rainbow', '~> 3.0', feature_category: :shared
@@ -327,8 +327,8 @@ gem 'js_regex', '~> 3.8', feature_category: :shared
327327
gem 'device_detector', feature_category: :shared
328328

329329
# Redis
330-
gem 'redis', '~> 5.3.0', feature_category: :redis
331-
gem 'redis-clustering', '~> 5.3.0', feature_category: :redis
330+
gem 'redis', '~> 5.4.0', feature_category: :redis
331+
gem 'redis-clustering', '~> 5.4.0', feature_category: :redis
332332
gem 'connection_pool', '~> 2.4', feature_category: :shared
333333

334334
# Redis session store
@@ -351,7 +351,6 @@ gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers
351351
gem 'kubeclient', '~> 4.11.0', feature_category: :shared
352352

353353
# AI
354-
gem 'ruby-openai', '~> 3.7', feature_category: :ai_abstraction_layer
355354
gem 'circuitbox', '2.0.0', feature_category: :ai_abstraction_layer
356355

357356
# Sanitize user input
@@ -379,13 +378,13 @@ gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared
379378

380379
gem 'rack-proxy', '~> 0.7.7', feature_category: :shared
381380

382-
gem 'cssbundling-rails', '1.4.1', feature_category: :shared
381+
gem 'cssbundling-rails', '1.4.2', feature_category: :shared
383382
gem 'terser', '1.0.2', feature_category: :shared
384383

385384
gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client', feature_category: :database
386385
gem 'addressable', '~> 2.8', feature_category: :shared
387386
gem 'gon', '~> 6.4.0', feature_category: :shared
388-
gem 'request_store', '~> 1.5.1', feature_category: :shared
387+
gem 'request_store', '~> 1.7.0', feature_category: :shared
389388
gem 'base32', '~> 0.3.0', feature_category: :shared
390389
gem 'gitlab-license', '~> 2.6', feature_category: :shared
391390

@@ -436,7 +435,7 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_
436435

437436
# Event-driven reactor for Ruby
438437
# Required manually in config/initializers/require_async_gem
439-
gem 'async', '~> 2.22.0', require: false, feature_category: :shared
438+
gem 'async', '~> 2.23.0', require: false, feature_category: :shared
440439

441440
# Security report schemas used to validate CI job artifacts of security jobs
442441
gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management
@@ -471,10 +470,10 @@ group :opentelemetry do
471470
gem 'opentelemetry-instrumentation-sidekiq', feature_category: :observability
472471
end
473472

474-
gem 'warning', '~> 1.3.0', feature_category: :shared
473+
gem 'warning', '~> 1.5.0', feature_category: :shared
475474

476475
group :development do
477-
gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling
476+
gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling
478477
gem 'rubocop', feature_category: :tooling
479478
gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared
480479

@@ -549,7 +548,7 @@ group :development, :test do
549548
# For now we only use vite in development / test, and not for production builds
550549
# See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106
551550
gem 'vite_rails', '~> 3.0.17', feature_category: :shared
552-
gem 'vite_ruby', '~> 3.8.0', feature_category: :shared
551+
gem 'vite_ruby', '~> 3.9.0', feature_category: :shared
553552

554553
gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
555554
end
@@ -562,7 +561,7 @@ group :development, :test, :coverage do
562561
gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
563562
gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
564563
gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling
565-
gem 'undercover', '~> 0.5.0', require: false, feature_category: :tooling
564+
gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling
566565
end
567566

568567
# Gems required in omnibus-gitlab pipeline
@@ -589,20 +588,20 @@ group :test do
589588

590589
gem 'graphlyte', '~> 1.0.0', feature_category: :shared
591590

592-
gem 'shoulda-matchers', '~> 5.1.0', require: false, feature_category: :shared
591+
gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared
593592
gem 'email_spec', '~> 2.3.0', feature_category: :shared
594593
gem 'webmock', '~> 3.25.0', feature_category: :shared
595594
gem 'rails-controller-testing', feature_category: :shared
596595
gem 'concurrent-ruby', '~> 1.1', feature_category: :shared
597596
gem 'test-prof', '~> 1.4.0', feature_category: :tooling
598597
gem 'rspec_junit_formatter', feature_category: :shared
599598
gem 'guard-rspec', feature_category: :shared
600-
gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling
599+
gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling
601600

602601
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
603602
gem 'derailed_benchmarks', require: false, feature_category: :shared
604603

605-
gem 'gitlab_quality-test_tooling', '~> 2.4.0', require: false, feature_category: :tooling
604+
gem 'gitlab_quality-test_tooling', '~> 2.8.0', require: false, feature_category: :tooling
606605
end
607606

608607
gem 'octokit', '~> 9.0', feature_category: :importers
@@ -655,9 +654,9 @@ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
655654
gem 'toml-rb', '~> 2.2.0', feature_category: :shared
656655

657656
# Feature toggles
658-
gem 'flipper', '~> 0.26.2', feature_category: :shared
659-
gem 'flipper-active_record', '~> 0.26.2', feature_category: :shared
660-
gem 'flipper-active_support_cache_store', '~> 0.26.2', feature_category: :shared
657+
gem 'flipper', '~> 0.28.0', feature_category: :shared
658+
gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared
659+
gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared
661660
gem 'unleash', '~> 3.2.2', feature_category: :shared
662661
gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared
663662

@@ -696,10 +695,10 @@ gem 'valid_email', '~> 0.1', feature_category: :shared
696695

697696
# JSON
698697
gem 'jsonb_accessor', '~> 1.4', feature_category: :shared
699-
gem 'json', '~> 2.7.2', feature_category: :shared
698+
gem 'json', '~> 2.10.0', feature_category: :shared
700699
gem 'json_schemer', '~> 2.3.0', feature_category: :shared
701-
gem 'oj', '~> 3.13.21', feature_category: :shared
702-
gem 'oj-introspect', '~> 0.7', feature_category: :shared
700+
gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared
701+
gem 'oj-introspect', '~> 0.8', feature_category: :shared
703702
gem 'multi_json', '~> 1.14.1', feature_category: :shared
704703
gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared
705704

@@ -746,7 +745,7 @@ gem 'net-http', '= 0.6.0', feature_category: :shared
746745
# This is locked to 0.13.0 because the default parser changes from RFC2396 to RFC3986,
747746
# which can be removed after Rails 7.2 upgrade
748747
# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173142#note_2277952450
749-
gem 'uri', '= 0.13.0', feature_category: :shared
748+
gem 'uri', '= 0.13.2', feature_category: :shared
750749

751750
gem 'duo_api', '~> 1.3', feature_category: :system_access
752751

0 commit comments

Comments
 (0)