gitlab: 14.2.1 -> 14.2.3
This commit is contained in:
parent
d14e9188d1
commit
6ede6d2740
9 changed files with 38 additions and 38 deletions
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "14.2.1",
|
||||
"repo_hash": "0ivymkqcwl2lrnv0lkcw2ch26iyz9ixklrkc2jq38pbwc0igf89z",
|
||||
"version": "14.2.3",
|
||||
"repo_hash": "06fr8srz5ii0h65b1h2zfm8kzqz9g8jy2aq4g5js6kmv44zjya1p",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.2.1-ee",
|
||||
"rev": "v14.2.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.2.1",
|
||||
"GITALY_SERVER_VERSION": "14.2.3",
|
||||
"GITLAB_PAGES_VERSION": "1.42.0",
|
||||
"GITLAB_SHELL_VERSION": "13.19.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.2.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "14.2.3"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.3.2'
|
|||
gem 'rdoc', '~> 6.0'
|
||||
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
|
||||
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
|
||||
gem 'grpc', '~> 1.38.0'
|
||||
gem 'grpc', '~> 1.30.2'
|
||||
gem 'sentry-raven', '~> 3.0', require: false
|
||||
gem 'faraday', '~> 1.0'
|
||||
gem 'rbtrace', require: false
|
||||
|
@ -29,5 +29,5 @@ group :development, :test do
|
|||
gem 'factory_bot', require: false
|
||||
gem 'pry', '~> 0.12.2', require: false
|
||||
|
||||
gem 'grpc-tools', '= 1.38.0'
|
||||
gem 'grpc-tools', '= 1.30.2'
|
||||
end
|
||||
|
|
|
@ -77,10 +77,10 @@ GEM
|
|||
google-protobuf (3.17.3)
|
||||
googleapis-common-protos-types (1.1.0)
|
||||
google-protobuf (~> 3.14)
|
||||
grpc (1.38.0)
|
||||
google-protobuf (~> 3.15)
|
||||
grpc (1.30.2)
|
||||
google-protobuf (~> 3.12)
|
||||
googleapis-common-protos-types (~> 1.0)
|
||||
grpc-tools (1.38.0)
|
||||
grpc-tools (1.30.2)
|
||||
i18n (1.8.10)
|
||||
concurrent-ruby (~> 1.0)
|
||||
ice_nine (0.11.2)
|
||||
|
@ -225,8 +225,8 @@ DEPENDENCIES
|
|||
gitlab-labkit (~> 0.20.0)
|
||||
gitlab-markup (~> 1.7.1)
|
||||
google-protobuf (~> 3.17.0)
|
||||
grpc (~> 1.38.0)
|
||||
grpc-tools (= 1.38.0)
|
||||
grpc (~> 1.30.2)
|
||||
grpc-tools (= 1.30.2)
|
||||
licensee (~> 9.14.1)
|
||||
pry (~> 0.12.2)
|
||||
rbtrace
|
||||
|
|
|
@ -10,7 +10,7 @@ let
|
|||
copyGemFiles = true;
|
||||
gemdir = ./.;
|
||||
};
|
||||
version = "14.2.1";
|
||||
version = "14.2.3";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
|
@ -22,7 +22,7 @@ buildGoModule {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B3NtdS1UcT+nYIdoXs+tW2gnXZ0ew+NiIcCNi5z5fOc=";
|
||||
sha256 = "sha256-TSA5CoNaLeMu7O02rsaR/rNciLwzxSIUUQsCo40Z15c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE=";
|
||||
|
|
|
@ -311,20 +311,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12";
|
||||
sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.38.0";
|
||||
version = "1.30.2";
|
||||
};
|
||||
grpc-tools = {
|
||||
groups = ["development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sfbf5s19nfgznlb7m2sfw9l0ppvypj46ijjvq5p35fc6b8by5aq";
|
||||
sha256 = "0k9zhsqhamp02ryzgfb4y2bbick151vlhrhj0kqbbz9lyhms0bd4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.38.0";
|
||||
version = "1.30.2";
|
||||
};
|
||||
i18n = {
|
||||
dependencies = ["concurrent-ruby"];
|
||||
|
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.2.1";
|
||||
version = "14.2.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
@ -101,7 +101,7 @@ gem 'graphql', '~> 1.11.8'
|
|||
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
|
||||
# https://gitlab.com/gitlab-org/gitlab/issues/31747
|
||||
gem 'graphiql-rails', '~> 1.4.10'
|
||||
gem 'apollo_upload_server', '~> 2.0.2'
|
||||
gem 'apollo_upload_server', '~> 2.1.0'
|
||||
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
|
||||
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
|
||||
|
||||
|
@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1'
|
|||
gem 'premailer-rails', '~> 1.10.3'
|
||||
|
||||
# LabKit: Tracing and Correlation
|
||||
gem 'gitlab-labkit', '~> 0.21.0'
|
||||
gem 'gitlab-labkit', '~> 0.21.1'
|
||||
# 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'
|
||||
|
@ -479,7 +479,7 @@ gem 'gitaly', '~> 14.2.0.pre.rc2'
|
|||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.0.2'
|
||||
|
||||
gem 'grpc', '~> 1.38.0'
|
||||
gem 'grpc', '~> 1.30.2'
|
||||
|
||||
gem 'google-protobuf', '~> 3.17.1'
|
||||
|
||||
|
|
|
@ -73,9 +73,9 @@ GEM
|
|||
aes_key_wrap (1.1.0)
|
||||
akismet (3.0.0)
|
||||
android_key_attestation (0.3.0)
|
||||
apollo_upload_server (2.0.2)
|
||||
apollo_upload_server (2.1.0)
|
||||
actionpack (>= 4.2)
|
||||
graphql (>= 1.8)
|
||||
rails (>= 4.2)
|
||||
asana (0.10.3)
|
||||
faraday (~> 1.0)
|
||||
faraday_middleware (~> 1.0)
|
||||
|
@ -468,10 +468,10 @@ GEM
|
|||
fog-json (~> 1.2.0)
|
||||
mime-types
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
gitlab-labkit (0.21.0)
|
||||
gitlab-labkit (0.21.1)
|
||||
actionpack (>= 5.0.0, < 7.0.0)
|
||||
activesupport (>= 5.0.0, < 7.0.0)
|
||||
grpc (~> 1.38)
|
||||
grpc (~> 1.30.2)
|
||||
jaeger-client (~> 1.1)
|
||||
opentracing (~> 0.4)
|
||||
pg_query (~> 2.1)
|
||||
|
@ -566,8 +566,8 @@ GEM
|
|||
graphql (~> 1.6)
|
||||
html-pipeline (~> 2.8)
|
||||
sass (~> 3.4)
|
||||
grpc (1.38.0)
|
||||
google-protobuf (~> 3.15)
|
||||
grpc (1.30.2)
|
||||
google-protobuf (~> 3.12)
|
||||
googleapis-common-protos-types (~> 1.0)
|
||||
gssapi (1.2.0)
|
||||
ffi (>= 1.0.1)
|
||||
|
@ -1385,7 +1385,7 @@ DEPENDENCIES
|
|||
acts-as-taggable-on (~> 7.0)
|
||||
addressable (~> 2.8)
|
||||
akismet (~> 3.0)
|
||||
apollo_upload_server (~> 2.0.2)
|
||||
apollo_upload_server (~> 2.1.0)
|
||||
asana (~> 0.10.3)
|
||||
asciidoctor (~> 2.0.10)
|
||||
asciidoctor-include-ext (~> 0.3.1)
|
||||
|
@ -1471,7 +1471,7 @@ DEPENDENCIES
|
|||
gitlab-dangerfiles (~> 2.3.0)
|
||||
gitlab-experiment (~> 0.6.4)
|
||||
gitlab-fog-azure-rm (~> 1.1.1)
|
||||
gitlab-labkit (~> 0.21.0)
|
||||
gitlab-labkit (~> 0.21.1)
|
||||
gitlab-license (~> 2.0)
|
||||
gitlab-mail_room (~> 0.0.9)
|
||||
gitlab-markup (~> 1.7.1)
|
||||
|
@ -1493,7 +1493,7 @@ DEPENDENCIES
|
|||
graphlient (~> 0.4.0)
|
||||
graphql (~> 1.11.8)
|
||||
graphql-docs (~> 1.6.0)
|
||||
grpc (~> 1.38.0)
|
||||
grpc (~> 1.30.2)
|
||||
gssapi
|
||||
guard-rspec
|
||||
haml_lint (~> 0.36.0)
|
||||
|
|
|
@ -195,15 +195,15 @@
|
|||
version = "0.3.0";
|
||||
};
|
||||
apollo_upload_server = {
|
||||
dependencies = ["graphql" "rails"];
|
||||
dependencies = ["actionpack" "graphql"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xk54h9mmzhrbgbmk33v38pavb8w6421mx2yrgsdarkfl9fr90y3";
|
||||
sha256 = "0klhppx4vjfdvgz12wb63bcxy5ymk0mp8wkh01fpgjn2l3fwkwz5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
};
|
||||
asana = {
|
||||
dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
|
||||
|
@ -1987,10 +1987,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dzdxrn2ra21nyfnabj44fbwbccjkp3i7cjpym99pzbsx8dkna8z";
|
||||
sha256 = "09xci7jw5sckagnwfjlglz4cywylrf16r83f82asnnngvxadvvmq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
};
|
||||
gitlab-license = {
|
||||
groups = ["default"];
|
||||
|
@ -2278,10 +2278,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12";
|
||||
sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.38.0";
|
||||
version = "1.30.2";
|
||||
};
|
||||
gssapi = {
|
||||
dependencies = ["ffi"];
|
||||
|
|
Loading…
Reference in a new issue