Milan 2021-03-10 12:42:58 +01:00 committed by GitHub
parent 53012ee4f0
commit 86ee8dd8ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 16 deletions

View file

@ -1,13 +1,13 @@
{
"version": "13.8.4",
"repo_hash": "1q8q5v7c6g7yss26d6wg29h28fq1azy1smai97yk80cr0kirab8v",
"version": "13.8.5",
"repo_hash": "0dpyqynd6rscg07s58y0cjn7vfj2h21h51ja0fm6ll76wb02sbm6",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v13.8.4-ee",
"rev": "v13.8.5-ee",
"passthru": {
"GITALY_SERVER_VERSION": "13.8.4",
"GITALY_SERVER_VERSION": "13.8.5",
"GITLAB_PAGES_VERSION": "1.34.0",
"GITLAB_SHELL_VERSION": "13.15.1",
"GITLAB_WORKHORSE_VERSION": "8.59.0"
"GITLAB_WORKHORSE_VERSION": "8.59.2"
}
}

View file

@ -33,14 +33,14 @@ let
};
};
in buildGoModule rec {
version = "13.8.4";
version = "13.8.5";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-y8uy70ccQPba+JJmWace4LgLJkJNzVdFhrvq0AB8G5w=";
sha256 = "sha256-hKIjKltPPmz50Ru7elpHdeoyGAqgp+txR3fKleqY7hM=";
};
vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM=";

View file

@ -3,13 +3,13 @@
buildGoModule rec {
pname = "gitlab-workhorse";
version = "8.59.0";
version = "8.59.2";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "sha256-6JVt5hNWvnUm64SFqns1f1+xMP/KyPQ8H93jqXNT8n8=";
sha256 = "sha256-hMcE7dlUw34DyUO0v5JxwvvEh/HC2emrIKc1K1U4bPE=";
};
vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";

View file

@ -307,6 +307,9 @@ gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '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
gem 'thrift', '>= 0.14.0'
# I18n
gem 'ruby_parser', '~> 3.15', require: false

View file

@ -1176,7 +1176,7 @@ GEM
rack (>= 1, < 3)
thor (0.20.3)
thread_safe (0.3.6)
thrift (0.13.0)
thrift (0.14.0)
tilt (2.0.10)
timecop (0.9.1)
timeliness (0.3.10)
@ -1522,6 +1522,7 @@ DEPENDENCIES
terser (= 1.0.2)
test-prof (~> 0.12.0)
thin (~> 1.7.0)
thrift (>= 0.14.0)
timecop (~> 0.9.1)
toml-rb (~> 1.0.0)
truncato (~> 0.7.11)

View file

@ -5154,10 +5154,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q";
sha256 = "1v4q8wlc4kr952r24q9x60cvimn27g34h0j23imwqkrjcbngsj5n";
type = "gem";
};
version = "0.13.0";
version = "0.14.0";
};
tilt = {
groups = ["default" "development" "test"];

View file

@ -12330,11 +12330,11 @@
};
}
{
name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz";
name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz";
path = fetchurl {
name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz";
url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.32.4.tgz";
sha1 = "6fa920a99e38eaaf129580ac158cf730494a2190";
name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz";
url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.43.0.tgz";
sha1 = "b064a2cec1d27776f9a124bc70423cfa0bbc0d3f";
};
}
{