Merge pull request #129734 from yu-re-ka/feature/gitlab-14-0-5

gitlab: 14.0.2 -> 14.0.5
This commit is contained in:
Florian Klink 2021-07-13 01:04:54 +02:00 committed by GitHub
commit 66f419c4b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions

View file

@ -911,7 +911,7 @@ in {
}
{
assertion = versionAtLeast postgresqlPackage.version "12.0.0";
message = "PostgreSQL >=12 is required to run GitLab 14.";
message = "PostgreSQL >=12 is required to run GitLab 14. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading";
}
];

View file

@ -1,13 +1,13 @@
{
"version": "14.0.2",
"repo_hash": "1wnlkbjy7hm5lq6qc12dncmz321nhcnm8wvaz0ni1v5xpp3hv286",
"version": "14.0.5",
"repo_hash": "1rykrgzapqa3j2yqpd99fpyyrdp25h2xnx21gnjnkn58qljs4cgs",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.0.2-ee",
"rev": "v14.0.5-ee",
"passthru": {
"GITALY_SERVER_VERSION": "14.0.2",
"GITALY_SERVER_VERSION": "14.0.5",
"GITLAB_PAGES_VERSION": "1.40.0",
"GITLAB_SHELL_VERSION": "13.19.0",
"GITLAB_WORKHORSE_VERSION": "14.0.2"
"GITLAB_WORKHORSE_VERSION": "14.0.5"
}
}

View file

@ -21,14 +21,14 @@ let
};
};
in buildGoModule rec {
version = "14.0.2";
version = "14.0.5";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-0mLGtvRHgMN3TtH/g4XLDubwZvtB0xr2U30fufj//KY=";
sha256 = "sha256-aZ+EDF9BOdsbE+Xsde259eRmQhnb6H5piLQsvzgVpGM=";
};
vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I=";

View file

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "14.0.2";
version = "14.0.5";
src = fetchFromGitLab {
owner = data.owner;

View file

@ -1667,4 +1667,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.1)
BUNDLED WITH
2.1.4
2.2.20