Merge release-21.05 into staging-next-21.05
This commit is contained in:
commit
19307fbe2b
@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"version": "14.2.4",
|
"version": "14.3.1",
|
||||||
"repo_hash": "1bh95c7rrz9v2vn008lm4zqfm4n7my8r1b2665cippyi4bw0dfjr",
|
"repo_hash": "1ahqiczp978hc0i45djiz2c9pf32hw8hrmk3pg4bb6wg6315zmvl",
|
||||||
"owner": "gitlab-org",
|
"owner": "gitlab-org",
|
||||||
"repo": "gitlab",
|
"repo": "gitlab",
|
||||||
"rev": "v14.2.4-ee",
|
"rev": "v14.3.1-ee",
|
||||||
"passthru": {
|
"passthru": {
|
||||||
"GITALY_SERVER_VERSION": "14.2.4",
|
"GITALY_SERVER_VERSION": "14.3.1",
|
||||||
"GITLAB_PAGES_VERSION": "1.42.0",
|
"GITLAB_PAGES_VERSION": "1.44.0",
|
||||||
"GITLAB_SHELL_VERSION": "13.19.1",
|
"GITLAB_SHELL_VERSION": "13.21.0",
|
||||||
"GITLAB_WORKHORSE_VERSION": "14.2.4"
|
"GITLAB_WORKHORSE_VERSION": "14.3.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -108,7 +108,7 @@ GEM
|
|||||||
minitest (5.14.4)
|
minitest (5.14.4)
|
||||||
msgpack (1.3.3)
|
msgpack (1.3.3)
|
||||||
multipart-post (2.1.1)
|
multipart-post (2.1.1)
|
||||||
nokogiri (1.11.5)
|
nokogiri (1.11.7)
|
||||||
mini_portile2 (~> 2.5.0)
|
mini_portile2 (~> 2.5.0)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogumbo (1.5.0)
|
nokogumbo (1.5.0)
|
||||||
|
@ -20,7 +20,7 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
version = "14.2.4";
|
version = "14.3.1";
|
||||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||||
in
|
in
|
||||||
|
|
||||||
@ -32,10 +32,10 @@ buildGoModule {
|
|||||||
owner = "gitlab-org";
|
owner = "gitlab-org";
|
||||||
repo = "gitaly";
|
repo = "gitaly";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-jVYPJWFJN/KDEi8j+BOWTbH8xP0ZLPewhGsJfj5h/0w=";
|
sha256 = "sha256-0jjzrBpt8/wTnUAvrZi8lH9SknfYZawBbE/QmDxsVqM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE=";
|
vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit rubyEnv;
|
inherit rubyEnv;
|
||||||
|
@ -482,10 +482,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
|
sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.11.5";
|
version = "1.11.7";
|
||||||
};
|
};
|
||||||
nokogumbo = {
|
nokogumbo = {
|
||||||
dependencies = ["nokogiri"];
|
dependencies = ["nokogiri"];
|
||||||
|
@ -2,19 +2,19 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gitlab-shell";
|
pname = "gitlab-shell";
|
||||||
version = "13.19.1";
|
version = "13.21.0";
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "gitlab-org";
|
owner = "gitlab-org";
|
||||||
repo = "gitlab-shell";
|
repo = "gitlab-shell";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-F0TW0VjO5hc/lHqZhhMJJvpHazWRyR7Q7W324Fgn7fA=";
|
sha256 = "sha256-klj5N3UKCwJ5LveaiWv3i13GV/svZKeA1ZKKfvOjhg4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ ruby ];
|
buildInputs = [ ruby ];
|
||||||
|
|
||||||
patches = [ ./remove-hardcoded-locations.patch ];
|
patches = [ ./remove-hardcoded-locations.patch ];
|
||||||
|
|
||||||
vendorSha256 = "sha256-+nUMxHWo/d/WrQ4LAEG2+ghtNBF9vcnSyg6Ki412rPA=";
|
vendorSha256 = "sha256-cE6phpVYcZNCEk6bElEksIf4GOr/5vJPRdlGCubRafE=";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
|
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
|
||||||
|
@ -5,7 +5,7 @@ in
|
|||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gitlab-workhorse";
|
pname = "gitlab-workhorse";
|
||||||
|
|
||||||
version = "14.2.4";
|
version = "14.3.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = data.owner;
|
owner = data.owner;
|
||||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||||||
|
|
||||||
sourceRoot = "source/workhorse";
|
sourceRoot = "source/workhorse";
|
||||||
|
|
||||||
vendorSha256 = "sha256-q0LuXmjoO6mjVZpMRVVGL862mA+MaCejTCx99Zi5VEI=";
|
vendorSha256 = "sha256-piA14jYFV+FD20kR38rN1o329eeYAW/PmS0QI1GaU50=";
|
||||||
buildInputs = [ git ];
|
buildInputs = [ git ];
|
||||||
buildFlagsArray = "-ldflags=-X main.Version=${version}";
|
buildFlagsArray = "-ldflags=-X main.Version=${version}";
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.4.0'
|
|||||||
gem 'pg', '~> 1.1'
|
gem 'pg', '~> 1.1'
|
||||||
|
|
||||||
gem 'rugged', '~> 1.1'
|
gem 'rugged', '~> 1.1'
|
||||||
gem 'grape-path-helpers', '~> 1.6.3'
|
gem 'grape-path-helpers', '~> 1.7.0'
|
||||||
|
|
||||||
gem 'faraday', '~> 1.0'
|
gem 'faraday', '~> 1.0'
|
||||||
gem 'marginalia', '~> 1.10.0'
|
gem 'marginalia', '~> 1.10.0'
|
||||||
@ -32,7 +32,7 @@ gem 'bcrypt', '~> 3.1', '>= 3.1.14'
|
|||||||
gem 'doorkeeper', '~> 5.5.0.rc2'
|
gem 'doorkeeper', '~> 5.5.0.rc2'
|
||||||
gem 'doorkeeper-openid_connect', '~> 1.7.5'
|
gem 'doorkeeper-openid_connect', '~> 1.7.5'
|
||||||
gem 'rexml', '~> 3.2.5'
|
gem 'rexml', '~> 3.2.5'
|
||||||
gem 'ruby-saml', '~> 1.12.1'
|
gem 'ruby-saml', '~> 1.13.0'
|
||||||
gem 'omniauth', '~> 1.8'
|
gem 'omniauth', '~> 1.8'
|
||||||
gem 'omniauth-auth0', '~> 2.0.0'
|
gem 'omniauth-auth0', '~> 2.0.0'
|
||||||
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
|
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
|
||||||
@ -120,7 +120,7 @@ gem 'carrierwave', '~> 1.3'
|
|||||||
gem 'mini_magick', '~> 4.10.1'
|
gem 'mini_magick', '~> 4.10.1'
|
||||||
|
|
||||||
# for backups
|
# for backups
|
||||||
gem 'fog-aws', '~> 3.9'
|
gem 'fog-aws', '~> 3.12'
|
||||||
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
|
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
|
||||||
# Also see config/initializers/fog_core_patch.rb.
|
# Also see config/initializers/fog_core_patch.rb.
|
||||||
gem 'fog-core', '= 2.1.0'
|
gem 'fog-core', '= 2.1.0'
|
||||||
@ -233,7 +233,7 @@ gem 'redis', '~> 4.1.4'
|
|||||||
gem 'connection_pool', '~> 2.0'
|
gem 'connection_pool', '~> 2.0'
|
||||||
|
|
||||||
# Redis session store
|
# Redis session store
|
||||||
gem 'redis-rails', '~> 5.0.2'
|
gem 'redis-actionpack', '~> 5.2.0'
|
||||||
|
|
||||||
# Discord integration
|
# Discord integration
|
||||||
gem 'discordrb-webhooks', '~> 3.4', require: false
|
gem 'discordrb-webhooks', '~> 3.4', require: false
|
||||||
@ -333,7 +333,7 @@ gem 'snowplow-tracker', '~> 0.6.1'
|
|||||||
# Metrics
|
# Metrics
|
||||||
gem 'method_source', '~> 1.0', require: false
|
gem 'method_source', '~> 1.0', require: false
|
||||||
gem 'webrick', '~> 1.6.1', require: false
|
gem 'webrick', '~> 1.6.1', require: false
|
||||||
gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
|
gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client'
|
||||||
|
|
||||||
gem 'warning', '~> 1.2.0'
|
gem 'warning', '~> 1.2.0'
|
||||||
|
|
||||||
@ -372,7 +372,7 @@ group :development, :test do
|
|||||||
gem 'spring', '~> 2.1.0'
|
gem 'spring', '~> 2.1.0'
|
||||||
gem 'spring-commands-rspec', '~> 1.0.4'
|
gem 'spring-commands-rspec', '~> 1.0.4'
|
||||||
|
|
||||||
gem 'gitlab-styles', '~> 6.2.0', require: false
|
gem 'gitlab-styles', '~> 6.3.0', require: false
|
||||||
|
|
||||||
gem 'haml_lint', '~> 0.36.0', require: false
|
gem 'haml_lint', '~> 0.36.0', require: false
|
||||||
gem 'bundler-audit', '~> 0.7.0.1', require: false
|
gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||||
@ -474,7 +474,7 @@ end
|
|||||||
gem 'spamcheck', '~> 0.1.0'
|
gem 'spamcheck', '~> 0.1.0'
|
||||||
|
|
||||||
# Gitaly GRPC protocol definitions
|
# Gitaly GRPC protocol definitions
|
||||||
gem 'gitaly', '~> 14.2.0.pre.rc2'
|
gem 'gitaly', '~> 14.3.0.pre.rc1'
|
||||||
|
|
||||||
# KAS GRPC protocol definitions
|
# KAS GRPC protocol definitions
|
||||||
gem 'kas-grpc', '~> 0.0.2'
|
gem 'kas-grpc', '~> 0.0.2'
|
||||||
@ -522,7 +522,7 @@ gem 'lockbox', '~> 0.6.2'
|
|||||||
gem 'valid_email', '~> 0.1'
|
gem 'valid_email', '~> 0.1'
|
||||||
|
|
||||||
# JSON
|
# JSON
|
||||||
gem 'json', '~> 2.3.0'
|
gem 'json', '~> 2.5.1'
|
||||||
gem 'json_schemer', '~> 0.2.18'
|
gem 'json_schemer', '~> 0.2.18'
|
||||||
gem 'oj', '~> 3.10.6'
|
gem 'oj', '~> 3.10.6'
|
||||||
gem 'multi_json', '~> 1.14.1'
|
gem 'multi_json', '~> 1.14.1'
|
||||||
|
@ -365,7 +365,7 @@ GEM
|
|||||||
faraday_middleware
|
faraday_middleware
|
||||||
multi_json
|
multi_json
|
||||||
fast_blank (1.0.0)
|
fast_blank (1.0.0)
|
||||||
fast_gettext (1.6.0)
|
fast_gettext (2.1.0)
|
||||||
ffaker (2.10.0)
|
ffaker (2.10.0)
|
||||||
ffi (1.15.3)
|
ffi (1.15.3)
|
||||||
ffi-compiler (1.0.1)
|
ffi-compiler (1.0.1)
|
||||||
@ -388,7 +388,7 @@ GEM
|
|||||||
fog-json
|
fog-json
|
||||||
ipaddress (~> 0.8)
|
ipaddress (~> 0.8)
|
||||||
xml-simple (~> 1.1)
|
xml-simple (~> 1.1)
|
||||||
fog-aws (3.9.0)
|
fog-aws (3.12.0)
|
||||||
fog-core (~> 2.1)
|
fog-core (~> 2.1)
|
||||||
fog-json (~> 1.1)
|
fog-json (~> 1.1)
|
||||||
fog-xml (~> 0.1)
|
fog-xml (~> 0.1)
|
||||||
@ -446,7 +446,7 @@ GEM
|
|||||||
rails (>= 3.2.0)
|
rails (>= 3.2.0)
|
||||||
git (1.7.0)
|
git (1.7.0)
|
||||||
rchardet (~> 1.8)
|
rchardet (~> 1.8)
|
||||||
gitaly (14.2.0.pre.rc2)
|
gitaly (14.3.0.pre.rc1)
|
||||||
grpc (~> 1.0)
|
grpc (~> 1.0)
|
||||||
github-markup (1.7.0)
|
github-markup (1.7.0)
|
||||||
gitlab (4.16.1)
|
gitlab (4.16.1)
|
||||||
@ -486,7 +486,7 @@ GEM
|
|||||||
openid_connect (~> 1.2)
|
openid_connect (~> 1.2)
|
||||||
gitlab-sidekiq-fetcher (0.5.6)
|
gitlab-sidekiq-fetcher (0.5.6)
|
||||||
sidekiq (~> 5)
|
sidekiq (~> 5)
|
||||||
gitlab-styles (6.2.0)
|
gitlab-styles (6.3.0)
|
||||||
rubocop (~> 0.91, >= 0.91.1)
|
rubocop (~> 0.91, >= 0.91.1)
|
||||||
rubocop-gitlab-security (~> 0.1.1)
|
rubocop-gitlab-security (~> 0.1.1)
|
||||||
rubocop-performance (~> 1.9.2)
|
rubocop-performance (~> 1.9.2)
|
||||||
@ -539,7 +539,7 @@ GEM
|
|||||||
grape-entity (0.9.0)
|
grape-entity (0.9.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
multi_json (>= 1.3.2)
|
multi_json (>= 1.3.2)
|
||||||
grape-path-helpers (1.6.3)
|
grape-path-helpers (1.7.0)
|
||||||
activesupport
|
activesupport
|
||||||
grape (~> 1.3)
|
grape (~> 1.3)
|
||||||
rake (> 12)
|
rake (> 12)
|
||||||
@ -650,7 +650,7 @@ GEM
|
|||||||
character_set (~> 1.4)
|
character_set (~> 1.4)
|
||||||
regexp_parser (~> 2.1)
|
regexp_parser (~> 2.1)
|
||||||
regexp_property_values (~> 1.0)
|
regexp_property_values (~> 1.0)
|
||||||
json (2.3.0)
|
json (2.5.1)
|
||||||
json-jwt (1.13.0)
|
json-jwt (1.13.0)
|
||||||
activesupport (>= 4.2)
|
activesupport (>= 4.2)
|
||||||
aes_key_wrap
|
aes_key_wrap
|
||||||
@ -721,7 +721,7 @@ GEM
|
|||||||
activesupport (>= 4)
|
activesupport (>= 4)
|
||||||
railties (>= 4)
|
railties (>= 4)
|
||||||
request_store (~> 1.0)
|
request_store (~> 1.0)
|
||||||
loofah (2.11.0)
|
loofah (2.12.0)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
lru_redux (1.1.0)
|
lru_redux (1.1.0)
|
||||||
@ -893,7 +893,7 @@ GEM
|
|||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
os (1.1.1)
|
os (1.1.1)
|
||||||
parallel (1.20.1)
|
parallel (1.20.1)
|
||||||
parser (3.0.0.0)
|
parser (3.0.2.0)
|
||||||
ast (~> 2.4.1)
|
ast (~> 2.4.1)
|
||||||
parslet (1.8.2)
|
parslet (1.8.2)
|
||||||
pastel (0.8.0)
|
pastel (0.8.0)
|
||||||
@ -918,7 +918,7 @@ GEM
|
|||||||
coderay
|
coderay
|
||||||
parser
|
parser
|
||||||
unparser
|
unparser
|
||||||
prometheus-client-mmap (0.12.0)
|
prometheus-client-mmap (0.15.0)
|
||||||
pry (0.13.1)
|
pry (0.13.1)
|
||||||
coderay (~> 1.1)
|
coderay (~> 1.1)
|
||||||
method_source (~> 1.0)
|
method_source (~> 1.0)
|
||||||
@ -982,7 +982,7 @@ GEM
|
|||||||
rails-dom-testing (2.0.3)
|
rails-dom-testing (2.0.3)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
nokogiri (>= 1.6)
|
nokogiri (>= 1.6)
|
||||||
rails-html-sanitizer (1.3.0)
|
rails-html-sanitizer (1.4.2)
|
||||||
loofah (~> 2.3)
|
loofah (~> 2.3)
|
||||||
rails-i18n (6.0.0)
|
rails-i18n (6.0.0)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
@ -1016,19 +1016,12 @@ GEM
|
|||||||
actionpack (>= 5, < 7)
|
actionpack (>= 5, < 7)
|
||||||
redis-rack (>= 2.1.0, < 3)
|
redis-rack (>= 2.1.0, < 3)
|
||||||
redis-store (>= 1.1.0, < 2)
|
redis-store (>= 1.1.0, < 2)
|
||||||
redis-activesupport (5.2.0)
|
|
||||||
activesupport (>= 3, < 7)
|
|
||||||
redis-store (>= 1.3, < 2)
|
|
||||||
redis-namespace (1.8.1)
|
redis-namespace (1.8.1)
|
||||||
redis (>= 3.0.4)
|
redis (>= 3.0.4)
|
||||||
redis-rack (2.1.2)
|
redis-rack (2.1.3)
|
||||||
rack (>= 2.0.8, < 3)
|
rack (>= 2.0.8, < 3)
|
||||||
redis-store (>= 1.2, < 2)
|
redis-store (>= 1.2, < 2)
|
||||||
redis-rails (5.0.2)
|
redis-store (1.9.0)
|
||||||
redis-actionpack (>= 5.0, < 6)
|
|
||||||
redis-activesupport (>= 5.0, < 6)
|
|
||||||
redis-store (>= 1.2, < 2)
|
|
||||||
redis-store (1.8.1)
|
|
||||||
redis (>= 4, < 5)
|
redis (>= 4, < 5)
|
||||||
regexp_parser (2.1.1)
|
regexp_parser (2.1.1)
|
||||||
regexp_property_values (1.0.0)
|
regexp_property_values (1.0.0)
|
||||||
@ -1124,7 +1117,7 @@ GEM
|
|||||||
mini_portile2 (~> 2.5.0)
|
mini_portile2 (~> 2.5.0)
|
||||||
ruby-prof (1.3.1)
|
ruby-prof (1.3.1)
|
||||||
ruby-progressbar (1.11.0)
|
ruby-progressbar (1.11.0)
|
||||||
ruby-saml (1.12.1)
|
ruby-saml (1.13.0)
|
||||||
nokogiri (>= 1.10.5)
|
nokogiri (>= 1.10.5)
|
||||||
rexml
|
rexml
|
||||||
ruby-statistics (2.1.2)
|
ruby-statistics (2.1.2)
|
||||||
@ -1453,7 +1446,7 @@ DEPENDENCIES
|
|||||||
flipper-active_support_cache_store (~> 0.21.0)
|
flipper-active_support_cache_store (~> 0.21.0)
|
||||||
flowdock (~> 0.7)
|
flowdock (~> 0.7)
|
||||||
fog-aliyun (~> 0.3)
|
fog-aliyun (~> 0.3)
|
||||||
fog-aws (~> 3.9)
|
fog-aws (~> 3.12)
|
||||||
fog-core (= 2.1.0)
|
fog-core (= 2.1.0)
|
||||||
fog-google (~> 1.15)
|
fog-google (~> 1.15)
|
||||||
fog-local (~> 0.6)
|
fog-local (~> 0.6)
|
||||||
@ -1465,7 +1458,7 @@ DEPENDENCIES
|
|||||||
gettext (~> 3.3)
|
gettext (~> 3.3)
|
||||||
gettext_i18n_rails (~> 1.8.0)
|
gettext_i18n_rails (~> 1.8.0)
|
||||||
gettext_i18n_rails_js (~> 1.3)
|
gettext_i18n_rails_js (~> 1.3)
|
||||||
gitaly (~> 14.2.0.pre.rc2)
|
gitaly (~> 14.3.0.pre.rc1)
|
||||||
github-markup (~> 1.7.0)
|
github-markup (~> 1.7.0)
|
||||||
gitlab-chronic (~> 0.10.5)
|
gitlab-chronic (~> 0.10.5)
|
||||||
gitlab-dangerfiles (~> 2.3.0)
|
gitlab-dangerfiles (~> 2.3.0)
|
||||||
@ -1478,7 +1471,7 @@ DEPENDENCIES
|
|||||||
gitlab-net-dns (~> 0.9.1)
|
gitlab-net-dns (~> 0.9.1)
|
||||||
gitlab-omniauth-openid-connect (~> 0.8.0)
|
gitlab-omniauth-openid-connect (~> 0.8.0)
|
||||||
gitlab-sidekiq-fetcher (= 0.5.6)
|
gitlab-sidekiq-fetcher (= 0.5.6)
|
||||||
gitlab-styles (~> 6.2.0)
|
gitlab-styles (~> 6.3.0)
|
||||||
gitlab_chronic_duration (~> 0.10.6.2)
|
gitlab_chronic_duration (~> 0.10.6.2)
|
||||||
gitlab_omniauth-ldap (~> 2.1.1)
|
gitlab_omniauth-ldap (~> 2.1.1)
|
||||||
gon (~> 6.4.0)
|
gon (~> 6.4.0)
|
||||||
@ -1487,7 +1480,7 @@ DEPENDENCIES
|
|||||||
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)
|
||||||
grape-path-helpers (~> 1.6.3)
|
grape-path-helpers (~> 1.7.0)
|
||||||
grape_logging (~> 1.7)
|
grape_logging (~> 1.7)
|
||||||
graphiql-rails (~> 1.4.10)
|
graphiql-rails (~> 1.4.10)
|
||||||
graphlient (~> 0.4.0)
|
graphlient (~> 0.4.0)
|
||||||
@ -1510,7 +1503,7 @@ DEPENDENCIES
|
|||||||
ipaddress (~> 0.8.3)
|
ipaddress (~> 0.8.3)
|
||||||
jira-ruby (~> 2.1.4)
|
jira-ruby (~> 2.1.4)
|
||||||
js_regex (~> 3.7)
|
js_regex (~> 3.7)
|
||||||
json (~> 2.3.0)
|
json (~> 2.5.1)
|
||||||
json_schemer (~> 0.2.18)
|
json_schemer (~> 0.2.18)
|
||||||
jwt (~> 2.1.0)
|
jwt (~> 2.1.0)
|
||||||
kaminari (~> 1.0)
|
kaminari (~> 1.0)
|
||||||
@ -1567,7 +1560,7 @@ DEPENDENCIES
|
|||||||
pg_query (~> 2.1)
|
pg_query (~> 2.1)
|
||||||
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.15.0)
|
||||||
pry-byebug
|
pry-byebug
|
||||||
pry-rails (~> 0.3.9)
|
pry-rails (~> 0.3.9)
|
||||||
pry-shell (~> 0.4.0)
|
pry-shell (~> 0.4.0)
|
||||||
@ -1589,8 +1582,8 @@ DEPENDENCIES
|
|||||||
re2 (~> 1.2.0)
|
re2 (~> 1.2.0)
|
||||||
recaptcha (~> 4.11)
|
recaptcha (~> 4.11)
|
||||||
redis (~> 4.1.4)
|
redis (~> 4.1.4)
|
||||||
|
redis-actionpack (~> 5.2.0)
|
||||||
redis-namespace (~> 1.8.1)
|
redis-namespace (~> 1.8.1)
|
||||||
redis-rails (~> 5.0.2)
|
|
||||||
request_store (~> 1.5)
|
request_store (~> 1.5)
|
||||||
responders (~> 3.0)
|
responders (~> 3.0)
|
||||||
retriable (~> 3.1.2)
|
retriable (~> 3.1.2)
|
||||||
@ -1606,7 +1599,7 @@ DEPENDENCIES
|
|||||||
ruby-magic (~> 0.4)
|
ruby-magic (~> 0.4)
|
||||||
ruby-prof (~> 1.3.0)
|
ruby-prof (~> 1.3.0)
|
||||||
ruby-progressbar (~> 1.10)
|
ruby-progressbar (~> 1.10)
|
||||||
ruby-saml (~> 1.12.1)
|
ruby-saml (~> 1.13.0)
|
||||||
ruby_parser (~> 3.15)
|
ruby_parser (~> 3.15)
|
||||||
rubyzip (~> 2.0.0)
|
rubyzip (~> 2.0.0)
|
||||||
rugged (~> 1.1)
|
rugged (~> 1.1)
|
||||||
|
@ -1598,10 +1598,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3";
|
sha256 = "05df0w58w748n3bwcb5cbbh6l203hwl6k59vl6p3qfq0bay5s28d";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.6.0";
|
version = "2.1.0";
|
||||||
};
|
};
|
||||||
ffaker = {
|
ffaker = {
|
||||||
groups = ["development" "test"];
|
groups = ["development" "test"];
|
||||||
@ -1705,10 +1705,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "10y32rm3vcfh82p2fdr2zq8ibknx1jslmai5m0r261bdr3brkssm";
|
sha256 = "0cl9b93mwhzm9fp0lmac1vzz359g3sq52k06kn0a0vnvxrxnhzjm";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "3.9.0";
|
version = "3.12.0";
|
||||||
};
|
};
|
||||||
fog-core = {
|
fog-core = {
|
||||||
dependencies = ["builder" "excon" "formatador" "mime-types"];
|
dependencies = ["builder" "excon" "formatador" "mime-types"];
|
||||||
@ -1911,10 +1911,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0y4zsl1s7ysb1z6piczfkscbjnx7hchda3jsdam42dmi40z654dp";
|
sha256 = "0k0jrimdg0pij75hndkrl28hqgvsnl7sdn5k6mjv3sjwbm1p217w";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "14.2.0.pre.rc2";
|
version = "14.3.0.pre.rc1";
|
||||||
};
|
};
|
||||||
github-markup = {
|
github-markup = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
@ -2060,10 +2060,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1lgjp6cfb92z7i03f9k519bjabnnh1k0bgzmagp5x15iza73sz4v";
|
sha256 = "1vxg5j9405r5xvwnswhm2r7pg9pn6pqg675pxz6f8d3sxy5z963p";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "6.2.0";
|
version = "6.3.0";
|
||||||
};
|
};
|
||||||
gitlab_chronic_duration = {
|
gitlab_chronic_duration = {
|
||||||
dependencies = ["numerizer"];
|
dependencies = ["numerizer"];
|
||||||
@ -2202,10 +2202,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1jbajciakiq9wwax2x11jzhmwzkcpkb4c0gfl01aj8a3l99gvgs9";
|
sha256 = "1r9p47kcf1j56pd0zijakcqp1mi5563z3i2kkbhx2pc3y95zca6d";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.6.3";
|
version = "1.7.0";
|
||||||
};
|
};
|
||||||
grape_logging = {
|
grape_logging = {
|
||||||
dependencies = ["grape" "rack"];
|
dependencies = ["grape" "rack"];
|
||||||
@ -2648,10 +2648,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
|
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.3.0";
|
version = "2.5.1";
|
||||||
};
|
};
|
||||||
json-jwt = {
|
json-jwt = {
|
||||||
dependencies = ["activesupport" "aes_key_wrap" "bindata"];
|
dependencies = ["activesupport" "aes_key_wrap" "bindata"];
|
||||||
@ -2917,10 +2917,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0pwik3x5fa92g6hbv4imz3n46nlkzgj69pkgql22ppmcr36knk6m";
|
sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.11.0";
|
version = "2.12.0";
|
||||||
};
|
};
|
||||||
lru_redux = {
|
lru_redux = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
@ -3752,10 +3752,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml";
|
sha256 = "06ma6w87ph8lnc9z4hi40ynmcdnjv0p8x53x0s3fjkz4q2p6sxh5";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "3.0.0.0";
|
version = "3.0.2.0";
|
||||||
};
|
};
|
||||||
parslet = {
|
parslet = {
|
||||||
groups = ["default" "development" "test"];
|
groups = ["default" "development" "test"];
|
||||||
@ -3875,14 +3875,14 @@
|
|||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
};
|
};
|
||||||
prometheus-client-mmap = {
|
prometheus-client-mmap = {
|
||||||
groups = ["metrics"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1i0h9ixdvxw1n9ynxsrbc1lkx3dvd6r78iiwgwnqfz3fap6jgd9p";
|
sha256 = "0vn736898qyyw29kjyjifx2bg18r6gfaw3q8xzjgmr0jk4jz29c3";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "0.12.0";
|
version = "0.15.0";
|
||||||
};
|
};
|
||||||
pry = {
|
pry = {
|
||||||
dependencies = ["coderay" "method_source"];
|
dependencies = ["coderay" "method_source"];
|
||||||
@ -4130,10 +4130,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
|
sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.3.0";
|
version = "1.4.2";
|
||||||
};
|
};
|
||||||
rails-i18n = {
|
rails-i18n = {
|
||||||
dependencies = ["i18n" "railties"];
|
dependencies = ["i18n" "railties"];
|
||||||
@ -4316,17 +4316,6 @@
|
|||||||
};
|
};
|
||||||
version = "5.2.0";
|
version = "5.2.0";
|
||||||
};
|
};
|
||||||
redis-activesupport = {
|
|
||||||
dependencies = ["activesupport" "redis-store"];
|
|
||||||
groups = ["default"];
|
|
||||||
platforms = [];
|
|
||||||
source = {
|
|
||||||
remotes = ["https://rubygems.org"];
|
|
||||||
sha256 = "14a3z8810j02ysvg53f3mvcfb4rw34m91yfd19zy9y5lb3yv2g59";
|
|
||||||
type = "gem";
|
|
||||||
};
|
|
||||||
version = "5.2.0";
|
|
||||||
};
|
|
||||||
redis-namespace = {
|
redis-namespace = {
|
||||||
dependencies = ["redis"];
|
dependencies = ["redis"];
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
@ -4344,21 +4333,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0ldw5sxyd80pv0gr89kvn6ziszlbs8lv1a573fkm6d0f11fps413";
|
sha256 = "1nblbxg1f051dn83jp92lz3lc1wxm18nviglrabv2l0vz6rd0pkb";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.1.2";
|
version = "2.1.3";
|
||||||
};
|
|
||||||
redis-rails = {
|
|
||||||
dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
|
|
||||||
groups = ["default"];
|
|
||||||
platforms = [];
|
|
||||||
source = {
|
|
||||||
remotes = ["https://rubygems.org"];
|
|
||||||
sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40";
|
|
||||||
type = "gem";
|
|
||||||
};
|
|
||||||
version = "5.0.2";
|
|
||||||
};
|
};
|
||||||
redis-store = {
|
redis-store = {
|
||||||
dependencies = ["redis"];
|
dependencies = ["redis"];
|
||||||
@ -4366,10 +4344,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1isqzzds9kszc2nn8jiy8ikry01qspn7637ba9z2k6sk7vky46d9";
|
sha256 = "0cpzbf2svnk4j5awb24ncl0mih45zkbdrd7q23jdg1r8k3q7mdg6";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.8.1";
|
version = "1.9.0";
|
||||||
};
|
};
|
||||||
regexp_parser = {
|
regexp_parser = {
|
||||||
groups = ["default" "development" "test"];
|
groups = ["default" "development" "test"];
|
||||||
@ -4752,10 +4730,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0hczs2s490x6lj8z9xczlgi4c159nk9b10njsnl37nqbgjfkjgsw";
|
sha256 = "1706dyk5jdma75bnl9rhmx8vgzjw12ixnj3y32inmpcgzgsvs76k";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.12.1";
|
version = "1.13.0";
|
||||||
};
|
};
|
||||||
ruby-statistics = {
|
ruby-statistics = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -36,6 +36,7 @@ in {
|
|||||||
|
|
||||||
extraMeta.knownVulnerabilities = [
|
extraMeta.knownVulnerabilities = [
|
||||||
"CVE-2021-28041"
|
"CVE-2021-28041"
|
||||||
|
"CVE-2021-41617"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -66,6 +67,7 @@ in {
|
|||||||
|
|
||||||
extraMeta.knownVulnerabilities = [
|
extraMeta.knownVulnerabilities = [
|
||||||
"CVE-2021-28041"
|
"CVE-2021-28041"
|
||||||
|
"CVE-2021-41617"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user