gitlab: 14.0.1 -> 14.0.2 (#128963)
https://about.gitlab.com/releases/2021/07/01/security-release-gitlab-14-0-2-released/
This commit is contained in:
parent
5f4bbbffa4
commit
3f18b72c1e
|
@ -1,13 +1,13 @@
|
||||||
{
|
{
|
||||||
"version": "14.0.1",
|
"version": "14.0.2",
|
||||||
"repo_hash": "185jzzlnghws958y15q7mzc7y42sxxq26p5i7j92bky9nkc1sa81",
|
"repo_hash": "1wnlkbjy7hm5lq6qc12dncmz321nhcnm8wvaz0ni1v5xpp3hv286",
|
||||||
"owner": "gitlab-org",
|
"owner": "gitlab-org",
|
||||||
"repo": "gitlab",
|
"repo": "gitlab",
|
||||||
"rev": "v14.0.1-ee",
|
"rev": "v14.0.2-ee",
|
||||||
"passthru": {
|
"passthru": {
|
||||||
"GITALY_SERVER_VERSION": "14.0.1",
|
"GITALY_SERVER_VERSION": "14.0.2",
|
||||||
"GITLAB_PAGES_VERSION": "1.40.0",
|
"GITLAB_PAGES_VERSION": "1.40.0",
|
||||||
"GITLAB_SHELL_VERSION": "13.19.0",
|
"GITLAB_SHELL_VERSION": "13.19.0",
|
||||||
"GITLAB_WORKHORSE_VERSION": "14.0.1"
|
"GITLAB_WORKHORSE_VERSION": "14.0.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,14 +21,14 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in buildGoModule rec {
|
in buildGoModule rec {
|
||||||
version = "14.0.1";
|
version = "14.0.2";
|
||||||
pname = "gitaly";
|
pname = "gitaly";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "gitlab-org";
|
owner = "gitlab-org";
|
||||||
repo = "gitaly";
|
repo = "gitaly";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-x9QTuEPLtiPJqk1UVwrlYvULIQ93TERSfslO2LB55cY=";
|
sha256 = "sha256-0mLGtvRHgMN3TtH/g4XLDubwZvtB0xr2U30fufj//KY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I=";
|
vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I=";
|
||||||
|
|
|
@ -5,7 +5,7 @@ in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gitlab-workhorse";
|
pname = "gitlab-workhorse";
|
||||||
|
|
||||||
version = "14.0.1";
|
version = "14.0.2";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = data.owner;
|
owner = data.owner;
|
||||||
|
|
|
@ -157,7 +157,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/markup'
|
||||||
gem 'commonmarker', '~> 0.21'
|
gem 'commonmarker', '~> 0.21'
|
||||||
gem 'kramdown', '~> 2.3.1'
|
gem 'kramdown', '~> 2.3.1'
|
||||||
gem 'RedCloth', '~> 4.3.2'
|
gem 'RedCloth', '~> 4.3.2'
|
||||||
gem 'rdoc', '~> 6.1.2'
|
gem 'gitlab-rdoc', '~> 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695
|
||||||
gem 'org-ruby', '~> 0.9.12'
|
gem 'org-ruby', '~> 0.9.12'
|
||||||
gem 'creole', '~> 0.5.0'
|
gem 'creole', '~> 0.5.0'
|
||||||
gem 'wikicloth', '0.8.1'
|
gem 'wikicloth', '0.8.1'
|
||||||
|
@ -168,7 +168,7 @@ gem 'asciidoctor-kroki', '~> 0.4.0', require: false
|
||||||
gem 'rouge', '~> 3.26.0'
|
gem 'rouge', '~> 3.26.0'
|
||||||
gem 'truncato', '~> 0.7.11'
|
gem 'truncato', '~> 0.7.11'
|
||||||
gem 'bootstrap_form', '~> 4.2.0'
|
gem 'bootstrap_form', '~> 4.2.0'
|
||||||
gem 'nokogiri', '~> 1.11.1'
|
gem 'nokogiri', '~> 1.11.4'
|
||||||
gem 'escape_utils', '~> 1.1'
|
gem 'escape_utils', '~> 1.1'
|
||||||
|
|
||||||
# Calendar rendering
|
# Calendar rendering
|
||||||
|
|
|
@ -493,6 +493,7 @@ GEM
|
||||||
openid_connect (~> 1.2)
|
openid_connect (~> 1.2)
|
||||||
gitlab-pg_query (2.0.4)
|
gitlab-pg_query (2.0.4)
|
||||||
google-protobuf (>= 3.17.1)
|
google-protobuf (>= 3.17.1)
|
||||||
|
gitlab-rdoc (6.3.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.2.0)
|
||||||
|
@ -792,7 +793,7 @@ GEM
|
||||||
netrc (0.11.0)
|
netrc (0.11.0)
|
||||||
nio4r (2.5.4)
|
nio4r (2.5.4)
|
||||||
no_proxy_fix (0.1.2)
|
no_proxy_fix (0.1.2)
|
||||||
nokogiri (1.11.3)
|
nokogiri (1.11.4)
|
||||||
mini_portile2 (~> 2.5.0)
|
mini_portile2 (~> 2.5.0)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogumbo (2.0.2)
|
nokogumbo (2.0.2)
|
||||||
|
@ -1017,7 +1018,6 @@ GEM
|
||||||
msgpack (>= 0.4.3)
|
msgpack (>= 0.4.3)
|
||||||
optimist (>= 3.0.0)
|
optimist (>= 3.0.0)
|
||||||
rchardet (1.8.0)
|
rchardet (1.8.0)
|
||||||
rdoc (6.1.2)
|
|
||||||
re2 (1.2.0)
|
re2 (1.2.0)
|
||||||
recaptcha (4.13.1)
|
recaptcha (4.13.1)
|
||||||
json
|
json
|
||||||
|
@ -1490,6 +1490,7 @@ DEPENDENCIES
|
||||||
gitlab-net-dns (~> 0.9.1)
|
gitlab-net-dns (~> 0.9.1)
|
||||||
gitlab-omniauth-openid-connect (~> 0.4.0)
|
gitlab-omniauth-openid-connect (~> 0.4.0)
|
||||||
gitlab-pg_query (~> 2.0.4)
|
gitlab-pg_query (~> 2.0.4)
|
||||||
|
gitlab-rdoc (~> 6.3.2)
|
||||||
gitlab-sidekiq-fetcher (= 0.5.6)
|
gitlab-sidekiq-fetcher (= 0.5.6)
|
||||||
gitlab-styles (~> 6.2.0)
|
gitlab-styles (~> 6.2.0)
|
||||||
gitlab_chronic_duration (~> 0.10.6.2)
|
gitlab_chronic_duration (~> 0.10.6.2)
|
||||||
|
@ -1549,7 +1550,7 @@ DEPENDENCIES
|
||||||
net-ldap (~> 0.16.3)
|
net-ldap (~> 0.16.3)
|
||||||
net-ntp
|
net-ntp
|
||||||
net-ssh (~> 6.0)
|
net-ssh (~> 6.0)
|
||||||
nokogiri (~> 1.11.1)
|
nokogiri (~> 1.11.4)
|
||||||
oauth2 (~> 1.4)
|
oauth2 (~> 1.4)
|
||||||
octokit (~> 4.15)
|
octokit (~> 4.15)
|
||||||
ohai (~> 16.10)
|
ohai (~> 16.10)
|
||||||
|
@ -1597,7 +1598,6 @@ DEPENDENCIES
|
||||||
rainbow (~> 3.0)
|
rainbow (~> 3.0)
|
||||||
rblineprof (~> 0.3.6)
|
rblineprof (~> 0.3.6)
|
||||||
rbtrace (~> 0.4)
|
rbtrace (~> 0.4)
|
||||||
rdoc (~> 6.1.2)
|
|
||||||
re2 (~> 1.2.0)
|
re2 (~> 1.2.0)
|
||||||
recaptcha (~> 4.11)
|
recaptcha (~> 4.11)
|
||||||
redis (~> 4.0)
|
redis (~> 4.0)
|
||||||
|
|
|
@ -2095,6 +2095,16 @@
|
||||||
};
|
};
|
||||||
version = "2.0.4";
|
version = "2.0.4";
|
||||||
};
|
};
|
||||||
|
gitlab-rdoc = {
|
||||||
|
groups = ["default"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "04vdirkdj42as3rgj6qlgz5ly5vg45i9k184bmf5z556i3b1fyf9";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "6.3.2";
|
||||||
|
};
|
||||||
gitlab-sidekiq-fetcher = {
|
gitlab-sidekiq-fetcher = {
|
||||||
dependencies = ["sidekiq"];
|
dependencies = ["sidekiq"];
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
|
@ -3396,10 +3406,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
|
sha256 = "05rfzi8wksps5pgaavq1n1vkngsrjhqz8rcd1qdb52hnpg9q9p9b";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.11.3";
|
version = "1.11.4";
|
||||||
};
|
};
|
||||||
nokogumbo = {
|
nokogumbo = {
|
||||||
dependencies = ["nokogiri"];
|
dependencies = ["nokogiri"];
|
||||||
|
@ -4306,16 +4316,6 @@
|
||||||
};
|
};
|
||||||
version = "1.8.0";
|
version = "1.8.0";
|
||||||
};
|
};
|
||||||
rdoc = {
|
|
||||||
groups = ["default"];
|
|
||||||
platforms = [];
|
|
||||||
source = {
|
|
||||||
remotes = ["https://rubygems.org"];
|
|
||||||
sha256 = "0zh39dpsqlhhi4aba1sbrk504d88p38djk8cansjq0fwndq7w4zb";
|
|
||||||
type = "gem";
|
|
||||||
};
|
|
||||||
version = "6.1.2";
|
|
||||||
};
|
|
||||||
re2 = {
|
re2 = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user