gitlab: 13.12.4 -> 14.0.1

https://about.gitlab.com/releases/2021/06/22/gitlab-14-0-released/
https://about.gitlab.com/releases/2021/06/24/gitlab-14-0-1-released/
(cherry picked from commit facd0c68cc139aabff157f0a5f8deba621ed2ba8)
This commit is contained in:
Yureka
2021-07-13 15:27:21 +02:00
committed by Yuka
parent 3ebb71b547
commit e8e5b8a9bb
11 changed files with 706 additions and 537 deletions
@@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.16.2'
gem 'gitlab-labkit', '~> 0.17.1'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
@@ -65,13 +65,13 @@ GEM
gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1)
mime-types (>= 1.15)
rugged (~> 1.0)
gitlab-labkit (0.16.2)
gitlab-labkit (0.17.1)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
grpc (~> 1.19)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
pg_query (~> 1.3)
pg_query (~> 2.0)
redis (> 3.0.0, < 5.0.0)
gitlab-markup (1.7.1)
google-protobuf (3.14.0)
@@ -104,11 +104,11 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2020.1104)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
mini_portile2 (2.5.1)
minitest (5.14.2)
msgpack (1.3.3)
multipart-post (2.1.1)
nokogiri (1.11.1)
nokogiri (1.11.5)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (1.5.0)
@@ -121,7 +121,8 @@ GEM
parallel (1.19.2)
parser (2.7.2.0)
ast (~> 2.4.1)
pg_query (1.3.0)
pg_query (2.0.3)
google-protobuf (~> 3.15.5)
proc_to_ast (0.1.0)
coderay
parser
@@ -221,7 +222,7 @@ DEPENDENCIES
github-linguist (~> 7.12)
gitlab-gollum-lib (~> 4.2.7.10.gitlab.1)
gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
gitlab-labkit (~> 0.16.2)
gitlab-labkit (~> 0.17.1)
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.14.0)
grpc (~> 1.30.2)
@@ -21,17 +21,17 @@ let
};
};
in buildGoModule rec {
version = "13.12.4";
version = "14.0.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-5I06tzeOfVdtblgqI7neKBgwzXuU9hI/0V3gYEPMJJ0=";
sha256 = "sha256-x9QTuEPLtiPJqk1UVwrlYvULIQ93TERSfslO2LB55cY=";
};
vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY=";
vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I=";
passthru = {
inherit rubyEnv;
@@ -269,10 +269,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa";
sha256 = "1y1sk3xmxj14nzx7v2zgq4q4d5lh4v1pvhs03n03j3kp4fbrj469";
type = "gem";
};
version = "0.16.2";
version = "0.17.1";
};
gitlab-markup = {
groups = ["default"];
@@ -441,10 +441,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
type = "gem";
};
version = "2.5.0";
version = "2.5.1";
};
minitest = {
groups = ["default" "development" "test"];
@@ -482,10 +482,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
type = "gem";
};
version = "1.11.1";
version = "1.11.5";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -549,14 +549,15 @@
version = "2.7.2.0";
};
pg_query = {
dependencies = ["google-protobuf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf";
sha256 = "1mii63kgppy2zil2qn54c94z93b6ama6x7gq6rbv4xxlfk8ncrag";
type = "gem";
};
version = "1.3.0";
version = "2.0.3";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];