Unverified Commit 11fdcb16 authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

Merge pull request #202541 from yayayayaka/gitlab-15.6.0

gitlab: 15.4.4 -> 15.6.0
parents c0be9e4c 6b3629a3
Loading
Loading
Loading
Loading
+6 −22
Original line number Diff line number Diff line
@@ -16,22 +16,6 @@ let
                      else
                        pkgs.postgresql_12;

  # Git 2.36.1 seemingly contains a commit-graph related bug which is
  # easily triggered through GitLab, so we downgrade it to 2.35.x
  # until this issue is solved. See
  # https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101.
  gitPackage =
    let
      version = "2.35.4";
    in
      pkgs.git.overrideAttrs (oldAttrs: rec {
        inherit version;
        src = pkgs.fetchurl {
          url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
          sha256 = "sha256-mv13OdNkXggeKQkJ+47QcJ6lYmcw6Qjri1ZJ2ETCTOk=";
        };
      });

  gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
  gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
  pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
@@ -60,7 +44,7 @@ let
    prometheus_listen_addr = "localhost:9236"

    [git]
    bin_path = "${gitPackage}/bin/git"
    bin_path = "${pkgs.git}/bin/git"

    [gitaly-ruby]
    dir = "${cfg.packages.gitaly.ruby}"
@@ -157,7 +141,7 @@ let
      };
      workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
      gitlab_kas.secret_file = "${cfg.statePath}/.gitlab_kas_secret";
      git.bin_path = "${gitPackage}/bin/git";
      git.bin_path = "git";
      monitoring = {
        ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
        sidekiq_exporter = {
@@ -1325,7 +1309,7 @@ in {
      });
      path = with pkgs; [
        postgresqlPackage
        gitPackage
        git
        ruby
        openssh
        nodejs
@@ -1356,7 +1340,7 @@ in {
      path = with pkgs; [
        openssh
        procps  # See https://gitlab.com/gitlab-org/gitaly/issues/1562
        gitPackage
        git
        cfg.packages.gitaly.rubyEnv
        cfg.packages.gitaly.rubyEnv.wrappedRuby
        gzip
@@ -1402,7 +1386,7 @@ in {
      path = with pkgs; [
        remarshal
        exiftool
        gitPackage
        git
        gnutar
        gzip
        openssh
@@ -1475,7 +1459,7 @@ in {
      environment = gitlabEnv;
      path = with pkgs; [
        postgresqlPackage
        gitPackage
        git
        openssh
        nodejs
        procps
+9 −9
Original line number Diff line number Diff line
{
  "version": "15.4.4",
  "repo_hash": "sha256-iIgN1j02Lr/RtNeopqs6ndFqw8YIU2F6c49RGWvpmgc=",
  "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8",
  "version": "15.6.0",
  "repo_hash": "sha256-7Pjksu1l2QfhpYieEGB9coypSt/0iMfptCa69Iaoe3s=",
  "yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh",
  "owner": "gitlab-org",
  "repo": "gitlab",
  "rev": "v15.4.4-ee",
  "rev": "v15.6.0-ee",
  "passthru": {
    "GITALY_SERVER_VERSION": "15.4.4",
    "GITLAB_PAGES_VERSION": "1.62.0",
    "GITLAB_SHELL_VERSION": "14.10.0",
    "GITLAB_WORKHORSE_VERSION": "15.4.4"
    "GITALY_SERVER_VERSION": "15.6.0",
    "GITLAB_PAGES_VERSION": "1.63.0",
    "GITLAB_SHELL_VERSION": "14.13.0",
    "GITLAB_WORKHORSE_VERSION": "15.6.0"
  },
  "vendored_gems": [
    "bundler-checksum",
@@ -17,9 +17,9 @@
    "omniauth-azure-oauth2",
    "omniauth-cas3",
    "omniauth-gitlab",
    "omniauth-google-oauth2",
    "omniauth_crowd",
    "omniauth-salesforce",
    "attr_encrypted",
    "mail-smtp_pool",
    "microsoft_graph_mailer",
    "ipynbdiff",
+1 −4
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ let

      bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production
      bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production
      bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production
      bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
      bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
      bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production

@@ -137,9 +137,6 @@ stdenv.mkDerivation {
  patches = [
    # Change hardcoded paths to the NixOS equivalent
    ./remove-hardcoded-locations.patch

    # Bump pg to 1.4.3 (see https://github.com/NixOS/nixpkgs/pull/187946)
    ./update-pg.patch
  ];

  postPatch = ''
+11 −8
Original line number Diff line number Diff line
@@ -4,22 +4,27 @@ 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 '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 'rbtrace', require: false

# The Gitaly Gem contains the Protobuf and gRPC definitions required by the
# Ruby sidecar.
gem 'gitaly', '~> 15.5.0'

# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.24'
gem 'gitlab-labkit', '~> 0.28'

# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 9.15'

gem 'google-protobuf', '~> 3.21.0'
gem 'google-protobuf', '~> 3.21.9'

# 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.8.0'

group :development, :test do
  gem 'rubocop', '~> 0.69', require: false
@@ -28,8 +33,6 @@ group :development, :test do
  gem 'timecop', require: false
  gem 'factory_bot', require: false
  gem 'pry', '~> 0.12.2', require: false

  gem 'grpc-tools', '~> 1.42.0'
end

# Gems required in omnibus-gitlab pipeline
+13 −39
Original line number Diff line number Diff line
@@ -46,33 +46,21 @@ GEM
    faraday (1.0.1)
      multipart-post (>= 1.2, < 3)
    ffi (1.15.5)
    gemojione (3.3.0)
      json
    gitaly (15.5.0)
      grpc (~> 1.0)
    github-linguist (7.20.0)
      charlock_holmes (~> 0.7.7)
      escape_utils (~> 1.2.0)
      mini_mime (~> 1.0)
      rugged (~> 1.0)
    github-markup (1.7.0)
    gitlab-gollum-lib (4.2.7.10.gitlab.2)
      gemojione (~> 3.2)
      github-markup (~> 1.6)
      gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
      nokogiri (>= 1.6.1, < 2.0)
      rouge (~> 3.1)
      sanitize (~> 6.0)
      stringex (~> 2.6)
    gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1)
      mime-types (>= 1.15)
      rugged (~> 1.0)
    gitlab-labkit (0.24.0)
    gitlab-labkit (0.28.0)
      actionpack (>= 5.0.0, < 8.0.0)
      activesupport (>= 5.0.0, < 8.0.0)
      grpc (>= 1.37)
      jaeger-client (~> 1.1.0)
      opentracing (~> 0.4)
      pg_query (~> 2.1)
      redis (> 3.0.0, < 5.0.0)
      redis (> 3.0.0, < 6.0.0)
    gitlab-license_finder (6.14.2.1)
      bundler
      rubyzip (>= 1, < 3)
@@ -81,35 +69,30 @@ GEM
      with_env (= 1.1.0)
      xml-simple (~> 1.1.5)
    gitlab-markup (1.7.1)
    google-protobuf (3.21.5)
    google-protobuf (3.21.9)
    googleapis-common-protos-types (1.4.0)
      google-protobuf (~> 3.14)
    grpc (1.42.0)
      google-protobuf (~> 3.18)
      googleapis-common-protos-types (~> 1.0)
    grpc-tools (1.42.0)
    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
    ice_nine (0.11.2)
    jaeger-client (1.1.0)
      opentracing (~> 0.3)
      thrift
    json (2.5.1)
    licensee (9.15.2)
      dotenv (~> 2.0)
      octokit (~> 4.20)
      reverse_markdown (~> 1.0)
      rugged (>= 0.24, < 2.0)
      thor (>= 0.19, < 2.0)
    loofah (2.18.0)
    loofah (2.19.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    memoizable (0.4.2)
      thread_safe (~> 0.3, >= 0.3.1)
    method_source (0.9.2)
    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2020.1104)
    mini_mime (1.1.2)
    mini_portile2 (2.8.0)
    minitest (5.16.3)
@@ -126,7 +109,7 @@ GEM
    parallel (1.19.2)
    parser (3.0.3.2)
      ast (~> 2.4.1)
    pg_query (2.1.3)
    pg_query (2.2.0)
      google-protobuf (>= 3.19.2)
    proc_to_ast (0.1.0)
      coderay
@@ -151,13 +134,11 @@ GEM
      ffi (>= 1.0.6)
      msgpack (>= 0.4.3)
      optimist (>= 3.0.0)
    rdoc (6.3.2)
    redis (4.8.0)
    regexp_parser (1.8.1)
    reverse_markdown (1.4.0)
      nokogiri
    rexml (3.2.5)
    rouge (3.30.0)
    rspec (3.8.0)
      rspec-core (~> 3.8.0)
      rspec-expectations (~> 3.8.0)
@@ -191,18 +172,14 @@ GEM
    ruby-progressbar (1.10.1)
    rubyzip (2.3.2)
    rugged (1.2.0)
    sanitize (6.0.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    sawyer (0.8.2)
      addressable (>= 2.3.5)
      faraday (> 0.8, < 2.0)
    sentry-raven (3.0.4)
      faraday (>= 1.0)
    stringex (2.8.5)
    thor (1.1.0)
    thread_safe (0.3.6)
    thrift (0.16.0)
    thrift (0.17.0)
    timecop (0.9.1)
    tomlrb (2.0.1)
    tzinfo (2.0.5)
@@ -227,20 +204,17 @@ PLATFORMS
DEPENDENCIES
  activesupport (~> 6.1.6.1)
  factory_bot
  faraday (~> 1.0)
  gitaly (~> 15.5.0)
  github-linguist (~> 7.20.0)
  gitlab-gollum-lib (~> 4.2.7.10.gitlab.2)
  gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
  gitlab-labkit (~> 0.24)
  gitlab-labkit (~> 0.28)
  gitlab-license_finder
  gitlab-markup (~> 1.7.1)
  google-protobuf (~> 3.21.0)
  google-protobuf (~> 3.21.9)
  grpc (~> 1.42.0)
  grpc-tools (~> 1.42.0)
  licensee (~> 9.15)
  pry (~> 0.12.2)
  rbtrace
  rdoc (~> 6.0)
  redis (~> 4.8.0)
  rspec
  rspec-parameterized
  rubocop (~> 0.69)
@@ -249,4 +223,4 @@ DEPENDENCIES
  timecop

BUNDLED WITH
   2.3.15
   2.3.24
Loading