Commit b437573e authored by Yaya's avatar Yaya
Browse files

gitlab: 17.11.2 -> 18.0.0 

https://gitlab.com/gitlab-org/gitlab/-/blob/v18.0.0-ee/CHANGELOG.md
(cherry picked from commit 816aa29c)
parent d8c429b1

pkgs/applications/version-management/gitlab/data.json

+8 −8
Original line number Diff line number Diff line 
{

  "version": "17.11.2",

  "repo_hash": "1jaxqchqag6q0c4vmrpwnmflv72b2xpskba9b0m4y6w6sy7hqx7q",

  "yarn_hash": "0z06jaxqbg2wnq7yhpkba0cpxp4w4iy2cxla8nhc6kgx49xk179v",

  "version": "18.0.0",

  "repo_hash": "03x2ypyn7kkald6pzvzh19cmlr6km9fdssw823565rd1kikywb87",

  "yarn_hash": "0vv09y1pjcm2723jh842pgnmnrf4yqk7558v57dp08rxrqnsni5x",

  "owner": "gitlab-org",

  "repo": "gitlab",

  "rev": "v17.11.2-ee",

  "rev": "v18.0.0-ee",

  "passthru": {

    "GITALY_SERVER_VERSION": "17.11.2",

    "GITLAB_PAGES_VERSION": "17.11.2",

    "GITALY_SERVER_VERSION": "18.0.0",

    "GITLAB_PAGES_VERSION": "18.0.0",

    "GITLAB_SHELL_VERSION": "14.41.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.0",

    "GITLAB_WORKHORSE_VERSION": "17.11.2"

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.1",

    "GITLAB_WORKHORSE_VERSION": "18.0.0"

  }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ let 
              cp Cargo.lock $out

            '';

          };

          hash = "sha256-Jr3lS3gQI/jojWIUxEBp7a950mcOvnbjlRIFXvfGays=";

          hash = "sha256-73uliXjZNT8Ok98ai2rY+b0jYqxoQH3qW5YS+Ap6KK0=";

        };



        dontBuild = false;

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

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ in 
buildGoModule rec {

  pname = "gitlab-workhorse";



  version = "17.11.2";

  version = "18.0.0";



  # nixpkgs-update: no auto update

  src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec { 


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



  vendorHash = "sha256-76JO/oayqhv36WM7zC/a85l8CK1orsMuMksBYbmDN1o=";

  vendorHash = "sha256-tLlxsUCoSGvUpJnS0GsNobk2IuSEgs3R4UDUmNf+HrA=";

  buildInputs = [ git ];

  ldflags = [ "-X main.Version=${version}" ];

  doCheck = false;

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

+30 −31
Original line number Diff line number Diff line 
# frozen_string_literal: true



def next?

  File.basename(__FILE__) == "Gemfile.next"

end



source 'https://rubygems.org'



if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental
@@ -29,11 +25,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir 
#

# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails



if next?

gem 'rails', '~> 7.1.5.1', feature_category: :shared

else

  gem 'rails', '~> 7.0.8.7', feature_category: :shared

end



gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared

# This can be dropped after upgrading to Rails 7.2: https://github.com/rails/rails/pull/49674
@@ -88,7 +80,7 @@ gem 'marginalia', '~> 1.11.1', feature_category: :database 
gem 'declarative_policy', '~> 1.1.0', feature_category: :shared



# For source code paths mapping

gem 'coverband', '6.1.4', require: false, feature_category: :shared

gem 'coverband', '6.1.5', require: false, feature_category: :shared



# Authentication libraries

gem 'devise', '~> 4.9.3', feature_category: :system_access
@@ -197,6 +189,10 @@ gem 'hamlit', '~> 2.15.0', feature_category: :shared 
gem 'carrierwave', '~> 1.3', feature_category: :shared

gem 'mini_magick', '~> 4.12', feature_category: :shared



# PDF generation

gem 'prawn', feature_category: :vulnerability_management

gem 'prawn-svg', feature_category: :vulnerability_management



# for backups

gem 'fog-aws', '~> 3.26', feature_category: :shared

# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
@@ -242,9 +238,9 @@ gem 'seed-fu', '~> 2.3.7', feature_category: :shared 
gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search

gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search

gem 'elasticsearch-api', '7.17.11', feature_category: :global_search

gem 'aws-sdk-core', '~> 3.215.0', feature_category: :global_search

gem 'aws-sdk-core', '~> 3.223.0', feature_category: :global_search

gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search

gem 'aws-sdk-s3', '~> 1.177.0', feature_category: :global_search

gem 'aws-sdk-s3', '~> 1.185.0', feature_category: :global_search

gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search

gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search

# Used with Elasticsearch to support http keep-alive connections
@@ -270,7 +266,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdow 
gem 'rouge', '~> 4.5.0', feature_category: :shared

gem 'truncato', '~> 0.7.13', feature_category: :team_planning

gem 'nokogiri', '~> 1.18', feature_category: :shared

gem 'gitlab-glfm-markdown', '~> 0.0.29', feature_category: :markdown

gem 'gitlab-glfm-markdown', '~> 0.0.30', feature_category: :markdown

gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown

gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
@@ -319,7 +315,7 @@ gem 're2', '~> 2.15', feature_category: :shared 


# Misc



gem 'semver_dialects', '~> 3.6', feature_category: :software_composition_analysis

gem 'semver_dialects', '~> 3.7', feature_category: :software_composition_analysis

gem 'version_sorter', '~> 2.3', feature_category: :shared

gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared
@@ -395,9 +391,9 @@ gem 'gitlab-license', '~> 2.6', feature_category: :shared 
gem 'rack-attack', '~> 6.7.0', feature_category: :shared



# Sentry integration

gem 'sentry-ruby', '~> 5.22.0', feature_category: :observability

gem 'sentry-rails', '~> 5.22.0', feature_category: :observability

gem 'sentry-sidekiq', '~> 5.22.0', feature_category: :observability

gem 'sentry-ruby', '~> 5.23.0', feature_category: :observability

gem 'sentry-rails', '~> 5.23.0', feature_category: :observability

gem 'sentry-sidekiq', '~> 5.23.0', feature_category: :observability



# PostgreSQL query parsing

#
@@ -433,7 +429,7 @@ gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent' 
gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics



# Metrics

gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared

gem 'webrick', '~> 1.9.0', require: false, feature_category: :shared

gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_category: :shared



# Event-driven reactor for Ruby
@@ -478,7 +474,9 @@ gem 'warning', '~> 1.5.0', feature_category: :shared 
group :development do

  gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling

  gem 'rubocop', feature_category: :tooling

  gem 'solargraph', '~> 0.47.2', require: false, 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
@@ -505,9 +503,9 @@ group :development do 
end



group :development, :test do

  gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared

  gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared

  gem 'bullet', '~> 7.2.0', feature_category: :shared

  gem 'parser', '= 3.3.7.1', feature_category: :shared

  gem 'parser', '= 3.3.8.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
@@ -535,7 +533,7 @@ group :development, :test do 
  gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling



  gem 'knapsack', '~> 4.0.0', feature_category: :tooling

  gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling

  gem 'gitlab-crystalball', '~> 0.7.2', 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
@@ -559,7 +557,7 @@ group :development, :test do 
end



group :development, :test, :danger do

  gem 'gitlab-dangerfiles', '~> 4.8.0', require: false, feature_category: :tooling

  gem 'gitlab-dangerfiles', '~> 4.9.0', require: false, feature_category: :tooling

end



group :development, :test, :coverage do
@@ -602,11 +600,12 @@ group :test do 
  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.8.0', require: false, feature_category: :tooling

  gem 'gitlab_quality-test_tooling', '~> 2.10.0', require: false, feature_category: :tooling

end



gem 'octokit', '~> 9.0', feature_category: :importers
@@ -646,7 +645,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat 
gem 'gitaly', '~> 17.8.0', feature_category: :gitaly



# KAS GRPC protocol definitions

gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management

gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management



# Lock the version before issues below are resolved:

# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
@@ -670,7 +669,7 @@ gem 'lograge', '~> 0.5', feature_category: :shared 
gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api



# DNS Lookup

gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared

gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared



# Countries list

gem 'countries', '~> 4.0.0', feature_category: :shared
@@ -700,7 +699,7 @@ gem 'valid_email', '~> 0.1', feature_category: :shared 


# JSON

gem 'jsonb_accessor', '~> 1.4', feature_category: :shared

gem 'json', '~> 2.10.0', feature_category: :shared

gem 'json', '~> 2.11.0', feature_category: :shared

gem 'json_schemer', '~> 2.3.0', feature_category: :shared

gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared

gem 'oj-introspect', '~> 0.8', feature_category: :shared
@@ -716,7 +715,7 @@ gem 'parslet', '~> 1.8', feature_category: :shared 


gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared



gem 'ed25519', '~> 1.3.0', feature_category: :shared

gem 'ed25519', '~> 1.4.0', feature_category: :shared



# Error Tracking OpenAPI client

# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
@@ -729,7 +728,7 @@ gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software 
gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry



# Remote Development

gem 'devfile', '~> 0.4.3', feature_category: :workspaces

gem 'devfile', '~> 0.4.4', feature_category: :workspaces



# Apple plist parsing

gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops
@@ -756,8 +755,8 @@ gem 'duo_api', '~> 1.3', feature_category: :system_access 


gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation



gem 'paper_trail', '~> 15.0', feature_category: :shared

gem 'paper_trail', '~> 16.0', feature_category: :shared



gem "i18n_data", "~> 0.13.1", feature_category: :system_access



gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
 
gem "gitlab-cloud-connector", "~> 1.11", require: 'gitlab/cloud_connector', feature_category: :cloud_connector

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

+221 −152

File changed.

Preview size limit exceeded, changes collapsed.