gitlab: 13.10.2 -> 13.11.2 (#120947)

This commit is contained in:
Milan
2021-04-28 15:16:06 +02:00
committed by GitHub
parent 51729ed349
commit 5e2bfae1b8
12 changed files with 472 additions and 457 deletions
@@ -3,23 +3,23 @@ source 'https://rubygems.org'
gem 'rugged', '~> 1.1'
gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.0.3.4'
gem 'activesupport', '~> 6.0.3.6'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.3.gitlab.1', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
gem 'grpc', '~> 1.30.2'
gem 'sentry-raven', '~> 3.0', require: false
gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.15.0'
gem 'gitlab-labkit', '~> 0.16.2'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 9.14.1'
gem 'google-protobuf', '~> 3.12'
gem 'google-protobuf', '~> 3.14.0'
group :development, :test do
gem 'rubocop', '~> 0.69', require: false
@@ -2,20 +2,20 @@ GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
actionpack (6.0.3.4)
actionview (= 6.0.3.4)
activesupport (= 6.0.3.4)
actionpack (6.0.3.6)
actionview (= 6.0.3.6)
activesupport (= 6.0.3.6)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.0.3.4)
activesupport (= 6.0.3.4)
actionview (6.0.3.6)
activesupport (= 6.0.3.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.0.3.4)
activesupport (6.0.3.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -34,7 +34,7 @@ GEM
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
crass (1.0.6)
diff-lcs (1.3)
dotenv (2.7.6)
@@ -62,10 +62,10 @@ GEM
rouge (~> 3.1)
sanitize (~> 4.6.4)
stringex (~> 2.6)
gitlab-gollum-rugged_adapter (0.4.4.3.gitlab.1)
gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1)
mime-types (>= 1.15)
rugged (~> 1.0)
gitlab-labkit (0.15.0)
gitlab-labkit (0.16.2)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
grpc (~> 1.19)
@@ -74,14 +74,14 @@ GEM
pg_query (~> 1.3)
redis (> 3.0.0, < 5.0.0)
gitlab-markup (1.7.1)
google-protobuf (3.12.4)
google-protobuf (3.14.0)
googleapis-common-protos-types (1.0.5)
google-protobuf (~> 3.11)
grpc (1.30.2)
google-protobuf (~> 3.12)
googleapis-common-protos-types (~> 1.0)
grpc-tools (1.30.2)
i18n (1.8.5)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaeger-client (1.1.0)
@@ -94,7 +94,7 @@ GEM
reverse_markdown (~> 1.0)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
loofah (2.9.0)
loofah (2.9.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
@@ -196,7 +196,7 @@ GEM
stringex (2.8.5)
thor (1.1.0)
thread_safe (0.3.6)
thrift (0.13.0)
thrift (0.14.1)
timecop (0.9.1)
tzinfo (1.2.9)
thread_safe (~> 0.1)
@@ -215,15 +215,15 @@ PLATFORMS
ruby
DEPENDENCIES
activesupport (~> 6.0.3.4)
activesupport (~> 6.0.3.6)
factory_bot
faraday (~> 1.0)
github-linguist (~> 7.12)
gitlab-gollum-lib (~> 4.2.7.10.gitlab.1)
gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1)
gitlab-labkit (~> 0.15.0)
gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
gitlab-labkit (~> 0.16.2)
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.12)
google-protobuf (~> 3.14.0)
grpc (~> 1.30.2)
grpc-tools (= 1.30.2)
licensee (~> 9.14.1)
@@ -21,17 +21,17 @@ let
};
};
in buildGoModule rec {
version = "13.10.2";
version = "13.11.2";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-5CjZs5tpEEsgQGBFa8BeZ7SDhIeGKqAHWwbR8hSoCPs=";
sha256 = "sha256-qcrvNmnlrdJYXAlt65bA0Ij7zuX7QwVukC3A4KGL3sk=";
};
vendorSha256 = "sha256-8AopoiLmg6kfvYbZDOfFWBy1o5tbnxsKxSBX20OasIE=";
vendorSha256 = "sha256-VAXQPVyB+XdfOqGaT1H/83ed6xV+4Tr5fkBu1eyPe2k=";
passthru = {
inherit rubyEnv;
@@ -13,10 +13,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj";
sha256 = "10rn7gmnnwpm593xv6lcf4qa72wmlbyjg4zmdc3lpb5596whd3yz";
type = "gem";
};
version = "6.0.3.4";
version = "6.0.3.6";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -24,10 +24,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj";
sha256 = "0ikqpxsrsb7xmq6ds5iq22nj2j3ai16z8z2j5r6lk8pzbi0wwsz5";
type = "gem";
};
version = "6.0.3.4";
version = "6.0.3.6";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@@ -35,10 +35,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j";
sha256 = "0sls37x9pd2zmipn14c46gcjbfzlg269r413cvm0d58595qkiv7z";
type = "gem";
};
version = "6.0.3.4";
version = "6.0.3.6";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@@ -122,10 +122,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem";
};
version = "1.1.7";
version = "1.1.8";
};
crass = {
groups = ["default"];
@@ -258,10 +258,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rqi9h6k32azljmx2q0zibvs1m59wgh879h04jflxkcqyzj6wyyj";
sha256 = "0gvgqfn05swsazfxdwmlqcq8v2pjyy7dmyl3bd8b8jrrxbpmpxxg";
type = "gem";
};
version = "0.4.4.3.gitlab.1";
version = "0.4.4.4.gitlab.1";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
@@ -269,10 +269,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l9bsjszp5zyzbdsr9ls09d4yr2sb0xjc40x4rv7fbzk19n9xs71";
sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa";
type = "gem";
};
version = "0.15.0";
version = "0.16.2";
};
gitlab-markup = {
groups = ["default"];
@@ -289,10 +289,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj";
sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p";
type = "gem";
};
version = "3.12.4";
version = "3.14.0";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@@ -332,10 +332,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
type = "gem";
};
version = "1.8.5";
version = "1.8.10";
};
ice_nine = {
source = {
@@ -383,10 +383,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
type = "gem";
};
version = "2.9.0";
version = "2.9.1";
};
memoizable = {
dependencies = ["thread_safe"];
@@ -898,10 +898,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q";
sha256 = "1sfa4120a7yl3gxjcx990gyawsshfr22gfv5rvgpk72l2p9j2420";
type = "gem";
};
version = "0.13.0";
version = "0.14.1";
};
timecop = {
source = {