Merge pull request #126812 from petabyteboy/feature/gitlab-13-12-3
gitlab: 13.12.2 -> 13.12.3
This commit is contained in:
commit
07dc073d75
6 changed files with 24 additions and 26 deletions
|
@ -1,13 +1,13 @@
|
||||||
{
|
{
|
||||||
"version": "13.12.2",
|
"version": "13.12.3",
|
||||||
"repo_hash": "1wzbjw21pan5cfiz1jd03c3w9sgyvmn35f6dm2sr2k54acsw034p",
|
"repo_hash": "0kpdl1gwcxy13lwyl96nsia62wysrnxdygil6sz6s72hg0y2fsgr",
|
||||||
"owner": "gitlab-org",
|
"owner": "gitlab-org",
|
||||||
"repo": "gitlab",
|
"repo": "gitlab",
|
||||||
"rev": "v13.12.2-ee",
|
"rev": "v13.12.3-ee",
|
||||||
"passthru": {
|
"passthru": {
|
||||||
"GITALY_SERVER_VERSION": "13.12.2",
|
"GITALY_SERVER_VERSION": "13.12.3",
|
||||||
"GITLAB_PAGES_VERSION": "1.39.0",
|
"GITLAB_PAGES_VERSION": "1.39.0",
|
||||||
"GITLAB_SHELL_VERSION": "13.18.0",
|
"GITLAB_SHELL_VERSION": "13.18.0",
|
||||||
"GITLAB_WORKHORSE_VERSION": "13.12.2"
|
"GITLAB_WORKHORSE_VERSION": "13.12.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,14 +21,14 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in buildGoModule rec {
|
in buildGoModule rec {
|
||||||
version = "13.12.2";
|
version = "13.12.3";
|
||||||
pname = "gitaly";
|
pname = "gitaly";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "gitlab-org";
|
owner = "gitlab-org";
|
||||||
repo = "gitaly";
|
repo = "gitaly";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-jZg/OlecYlGjDxlxsayAuqzptil1OPtyPjOe1WYT0HY=";
|
sha256 = "sha256-qqLVYNCE8rKPBY5tj6AAoWcyIEtQZkO980NVPg0WO18=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY=";
|
vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY=";
|
||||||
|
|
|
@ -5,7 +5,7 @@ in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gitlab-workhorse";
|
pname = "gitlab-workhorse";
|
||||||
|
|
||||||
version = "13.12.2";
|
version = "13.12.3";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = data.owner;
|
owner = data.owner;
|
||||||
|
|
|
@ -309,12 +309,12 @@ gem 'rack-attack', '~> 6.3.0'
|
||||||
gem 'sentry-raven', '~> 3.0'
|
gem 'sentry-raven', '~> 3.0'
|
||||||
|
|
||||||
# PostgreSQL query parsing
|
# PostgreSQL query parsing
|
||||||
gem 'pg_query', '~> 2.0.3'
|
gem 'pg_query', '~> 1.3.0'
|
||||||
|
|
||||||
gem 'premailer-rails', '~> 1.10.3'
|
gem 'premailer-rails', '~> 1.10.3'
|
||||||
|
|
||||||
# LabKit: Tracing and Correlation
|
# LabKit: Tracing and Correlation
|
||||||
gem 'gitlab-labkit', '~> 0.17.1'
|
gem 'gitlab-labkit', '~> 0.16.2'
|
||||||
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
|
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
|
||||||
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
|
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
|
||||||
gem 'thrift', '>= 0.14.0'
|
gem 'thrift', '>= 0.14.0'
|
||||||
|
@ -485,7 +485,7 @@ gem 'gitaly', '~> 13.12.0.pre.rc1'
|
||||||
|
|
||||||
gem 'grpc', '~> 1.30.2'
|
gem 'grpc', '~> 1.30.2'
|
||||||
|
|
||||||
gem 'google-protobuf', '~> 3.15.8'
|
gem 'google-protobuf', '~> 3.14.0'
|
||||||
|
|
||||||
gem 'toml-rb', '~> 1.0.0'
|
gem 'toml-rb', '~> 1.0.0'
|
||||||
|
|
||||||
|
|
|
@ -460,13 +460,13 @@ GEM
|
||||||
fog-xml (~> 0.1.0)
|
fog-xml (~> 0.1.0)
|
||||||
google-api-client (>= 0.44.2, < 0.51)
|
google-api-client (>= 0.44.2, < 0.51)
|
||||||
google-cloud-env (~> 1.2)
|
google-cloud-env (~> 1.2)
|
||||||
gitlab-labkit (0.17.1)
|
gitlab-labkit (0.16.2)
|
||||||
actionpack (>= 5.0.0, < 7.0.0)
|
actionpack (>= 5.0.0, < 7.0.0)
|
||||||
activesupport (>= 5.0.0, < 7.0.0)
|
activesupport (>= 5.0.0, < 7.0.0)
|
||||||
grpc (~> 1.19)
|
grpc (~> 1.19)
|
||||||
jaeger-client (~> 1.1)
|
jaeger-client (~> 1.1)
|
||||||
opentracing (~> 0.4)
|
opentracing (~> 0.4)
|
||||||
pg_query (~> 2.0)
|
pg_query (~> 1.3)
|
||||||
redis (> 3.0.0, < 5.0.0)
|
redis (> 3.0.0, < 5.0.0)
|
||||||
gitlab-license (1.5.0)
|
gitlab-license (1.5.0)
|
||||||
gitlab-mail_room (0.0.9)
|
gitlab-mail_room (0.0.9)
|
||||||
|
@ -509,7 +509,7 @@ GEM
|
||||||
signet (~> 0.12)
|
signet (~> 0.12)
|
||||||
google-cloud-env (1.4.0)
|
google-cloud-env (1.4.0)
|
||||||
faraday (>= 0.17.3, < 2.0)
|
faraday (>= 0.17.3, < 2.0)
|
||||||
google-protobuf (3.15.8)
|
google-protobuf (3.14.0)
|
||||||
googleapis-common-protos-types (1.0.6)
|
googleapis-common-protos-types (1.0.6)
|
||||||
google-protobuf (~> 3.14)
|
google-protobuf (~> 3.14)
|
||||||
googleauth (0.14.0)
|
googleauth (0.14.0)
|
||||||
|
@ -896,8 +896,7 @@ GEM
|
||||||
peek (1.1.0)
|
peek (1.1.0)
|
||||||
railties (>= 4.0.0)
|
railties (>= 4.0.0)
|
||||||
pg (1.2.3)
|
pg (1.2.3)
|
||||||
pg_query (2.0.3)
|
pg_query (1.3.0)
|
||||||
google-protobuf (~> 3.15.5)
|
|
||||||
plist (3.6.0)
|
plist (3.6.0)
|
||||||
png_quantizator (0.2.1)
|
png_quantizator (0.2.1)
|
||||||
po_to_json (1.0.1)
|
po_to_json (1.0.1)
|
||||||
|
@ -1473,7 +1472,7 @@ DEPENDENCIES
|
||||||
gitlab-experiment (~> 0.5.4)
|
gitlab-experiment (~> 0.5.4)
|
||||||
gitlab-fog-azure-rm (~> 1.0.1)
|
gitlab-fog-azure-rm (~> 1.0.1)
|
||||||
gitlab-fog-google (~> 1.13)
|
gitlab-fog-google (~> 1.13)
|
||||||
gitlab-labkit (~> 0.17.1)
|
gitlab-labkit (~> 0.16.2)
|
||||||
gitlab-license (~> 1.5)
|
gitlab-license (~> 1.5)
|
||||||
gitlab-mail_room (~> 0.0.9)
|
gitlab-mail_room (~> 0.0.9)
|
||||||
gitlab-markup (~> 1.7.1)
|
gitlab-markup (~> 1.7.1)
|
||||||
|
@ -1485,7 +1484,7 @@ DEPENDENCIES
|
||||||
gitlab_omniauth-ldap (~> 2.1.1)
|
gitlab_omniauth-ldap (~> 2.1.1)
|
||||||
gon (~> 6.4.0)
|
gon (~> 6.4.0)
|
||||||
google-api-client (~> 0.33)
|
google-api-client (~> 0.33)
|
||||||
google-protobuf (~> 3.15.8)
|
google-protobuf (~> 3.14.0)
|
||||||
gpgme (~> 2.0.19)
|
gpgme (~> 2.0.19)
|
||||||
grape (~> 1.5.2)
|
grape (~> 1.5.2)
|
||||||
grape-entity (~> 0.9.0)
|
grape-entity (~> 0.9.0)
|
||||||
|
@ -1565,7 +1564,7 @@ DEPENDENCIES
|
||||||
parslet (~> 1.8)
|
parslet (~> 1.8)
|
||||||
peek (~> 1.1)
|
peek (~> 1.1)
|
||||||
pg (~> 1.1)
|
pg (~> 1.1)
|
||||||
pg_query (~> 2.0.3)
|
pg_query (~> 1.3.0)
|
||||||
png_quantizator (~> 0.2.1)
|
png_quantizator (~> 0.2.1)
|
||||||
premailer-rails (~> 1.10.3)
|
premailer-rails (~> 1.10.3)
|
||||||
prometheus-client-mmap (~> 0.12.0)
|
prometheus-client-mmap (~> 0.12.0)
|
||||||
|
|
|
@ -1978,10 +1978,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1y1sk3xmxj14nzx7v2zgq4q4d5lh4v1pvhs03n03j3kp4fbrj469";
|
sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "0.17.1";
|
version = "0.16.2";
|
||||||
};
|
};
|
||||||
gitlab-license = {
|
gitlab-license = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
|
@ -2127,10 +2127,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0d9ayd4c69iag9nny7yydjx6dw4ymd52x1kv917ngv3vmsdkv51x";
|
sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "3.15.8";
|
version = "3.14.0";
|
||||||
};
|
};
|
||||||
googleapis-common-protos-types = {
|
googleapis-common-protos-types = {
|
||||||
dependencies = ["google-protobuf"];
|
dependencies = ["google-protobuf"];
|
||||||
|
@ -3811,15 +3811,14 @@
|
||||||
version = "1.2.3";
|
version = "1.2.3";
|
||||||
};
|
};
|
||||||
pg_query = {
|
pg_query = {
|
||||||
dependencies = ["google-protobuf"];
|
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1mii63kgppy2zil2qn54c94z93b6ama6x7gq6rbv4xxlfk8ncrag";
|
sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.0.3";
|
version = "1.3.0";
|
||||||
};
|
};
|
||||||
plist = {
|
plist = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
|
|
Loading…
Reference in a new issue