Unverified Commit 309b8ce8 authored by Yureka's avatar Yureka Committed by GitHub
Browse files

gitlab: 15.10.1 -> 15.10.2 (#225716) 

https://about.gitlab.com/releases/2023/04/05/gitlab-15-10-2-released/
parent 0d29297c

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

+6 −6
Original line number Diff line number Diff line 
{

  "version": "15.10.1",

  "repo_hash": "sha256-BETTehy2GxZDGWLgdao1I0cqm4cNaL9lhXe+JmCNi10=",

  "version": "15.10.2",

  "repo_hash": "sha256-XjL1D2DschFn64D2KcTQP6pppecIN26LrWMJPUfYvgI=",

  "yarn_hash": "1il8dnjb7591ss6w14zibdihg3bylw866jjjclv1qm8cihp8k3y8",

  "owner": "gitlab-org",

  "repo": "gitlab",

  "rev": "v15.10.1-ee",

  "rev": "v15.10.2-ee",

  "passthru": {

    "GITALY_SERVER_VERSION": "15.10.1",

    "GITLAB_PAGES_VERSION": "15.10.1",

    "GITALY_SERVER_VERSION": "15.10.2",

    "GITLAB_PAGES_VERSION": "15.10.2",

    "GITLAB_SHELL_VERSION": "14.18.0",

    "GITLAB_WORKHORSE_VERSION": "15.10.1"

    "GITLAB_WORKHORSE_VERSION": "15.10.2"

  }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ let 
    gemdir = ./.;

  };



  version = "15.10.1";

  version = "15.10.2";

  package_version = "v${lib.versions.major version}";

  gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -22,7 +22,7 @@ let 
      owner = "gitlab-org";

      repo = "gitaly";

      rev = "v${version}";

      sha256 = "sha256-iGYmBMRno2qCvdklyztGTV48m0UMeozuyX7ZZdS7K/c=";

      sha256 = "sha256-18BmECQqzwwxl7nY5+Bi4oyA2EPd5HqzJdgVPV8J1OM=";

    };



    vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY=";

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

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "gitlab-pages";

  version = "15.10.1";

  version = "15.10.2";



  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-pages";

    rev = "v${version}";

    sha256 = "sha256-FZ7Ifb8bau1helYnmKcS90oASnjF/knxbtPsck6lwKk=";

    sha256 = "sha256-h3Q8dOz61sRhDxRlcPTP+yhP/ntTTqggyAFvTgu6m6k=";

  };



  vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";

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

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ in 
buildGoModule rec {

  pname = "gitlab-workhorse";



  version = "15.10.1";

  version = "15.10.2";



  src = fetchFromGitLab {

    owner = data.owner;

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

+4 −8
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ gem 'lru_redux' 
# Locked as long as quoted-printable encoding issues are not resolved

# Monkey-patched in `config/initializers/mail_encoding_patch.rb`

# See https://gitlab.com/gitlab-org/gitlab/issues/197386

gem 'mail', '= 2.7.1'

gem 'mail', '= 2.8.1'

gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false



gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer'
@@ -593,12 +593,8 @@ gem 'app_store_connect' 
# For phone verification

gem 'telesignenterprise', '~> 2.2'



# Ruby 3 extracts net-protocol into a separate gem, while Ruby 2 has it built-in

# This condition installs the gem only for Ruby 3 to avoid warnings on Ruby 2

# Can be removed when support for Ruby 2 is dropped

install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do

# BufferedIO patch

# Updating this version will require updating scripts/allowed_warnings.txt

gem 'net-protocol', '~> 0.1.3'

end



gem 'duo_api', '~> 1.3'