git.iko.soy/typeable/nixpkgs
on master help sign in
gitlab: 14.0.1 -> 14.0.2 (#128963)

https://about.gitlab.com/releases/2021/07/01/security-release-gitlab-14-0-2-released/

commit3f18b72c1e76e909be8a50effe6e0ccd8218b1a9 authorYuka <86169957+yu-re-ka@users.noreply.github.com> dateTue 6 Jul 2021, 08:16 (5 years ago) parent5f4bbbf
6 files changed+26−26
compare with master
unifiedsplit
pkgs/applications/version-management/gitlab/data.json+5−5 pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2 pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+1−1 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile+2−2 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock+4−4 pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix+12−12
pkgs/applications/version-management/gitlab/data.json+5−5
@@ -1,13 +1,13 @@
11{
2− "version": "14.0.1",
3− "repo_hash": "185jzzlnghws958y15q7mzc7y42sxxq26p5i7j92bky9nkc1sa81",
2+ "version": "14.0.2",
3+ "repo_hash": "1wnlkbjy7hm5lq6qc12dncmz321nhcnm8wvaz0ni1v5xpp3hv286",
44 "owner": "gitlab-org",
55 "repo": "gitlab",
6− "rev": "v14.0.1-ee",
6+ "rev": "v14.0.2-ee",
77 "passthru": {
8− "GITALY_SERVER_VERSION": "14.0.1",
8+ "GITALY_SERVER_VERSION": "14.0.2",
99 "GITLAB_PAGES_VERSION": "1.40.0",
1010 "GITLAB_SHELL_VERSION": "13.19.0",
11− "GITLAB_WORKHORSE_VERSION": "14.0.1"
11+ "GITLAB_WORKHORSE_VERSION": "14.0.2"
1212 }
1313}
pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2
@@ -21,14 +21,14 @@ let
2121 };
2222 };
2323in buildGoModule rec {
24− version = "14.0.1";
24+ version = "14.0.2";
2525 pname = "gitaly";
2626
2727 src = fetchFromGitLab {
2828 owner = "gitlab-org";
2929 repo = "gitaly";
3030 rev = "v${version}";
31− sha256 = "sha256-x9QTuEPLtiPJqk1UVwrlYvULIQ93TERSfslO2LB55cY=";
31+ sha256 = "sha256-0mLGtvRHgMN3TtH/g4XLDubwZvtB0xr2U30fufj//KY=";
3232 };
3333
3434 vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I=";
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+1−1
@@ -5,7 +5,7 @@ in
55buildGoModule rec {
66 pname = "gitlab-workhorse";
77
8− version = "14.0.1";
8+ version = "14.0.2";
99
1010 src = fetchFromGitLab {
1111 owner = data.owner;
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile+2−2
@@ -157,7 +157,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/markup'
157157gem 'commonmarker', '~> 0.21'
158158gem 'kramdown', '~> 2.3.1'
159159gem 'RedCloth', '~> 4.3.2'
160−gem 'rdoc', '~> 6.1.2'
160+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
161161gem 'org-ruby', '~> 0.9.12'
162162gem 'creole', '~> 0.5.0'
163163gem 'wikicloth', '0.8.1'
@@ -168,7 +168,7 @@ gem 'asciidoctor-kroki', '~> 0.4.0', require: false
168168gem 'rouge', '~> 3.26.0'
169169gem 'truncato', '~> 0.7.11'
170170gem 'bootstrap_form', '~> 4.2.0'
171−gem 'nokogiri', '~> 1.11.1'
171+gem 'nokogiri', '~> 1.11.4'
172172gem 'escape_utils', '~> 1.1'
173173
174174# Calendar rendering
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock+4−4
@@ -493,6 +493,7 @@ GEM
493493 openid_connect (~> 1.2)
494494 gitlab-pg_query (2.0.4)
495495 google-protobuf (>= 3.17.1)
496+ gitlab-rdoc (6.3.2)
496497 gitlab-sidekiq-fetcher (0.5.6)
497498 sidekiq (~> 5)
498499 gitlab-styles (6.2.0)
@@ -792,7 +793,7 @@ GEM
792793 netrc (0.11.0)
793794 nio4r (2.5.4)
794795 no_proxy_fix (0.1.2)
795− nokogiri (1.11.3)
796+ nokogiri (1.11.4)
796797 mini_portile2 (~> 2.5.0)
797798 racc (~> 1.4)
798799 nokogumbo (2.0.2)
@@ -1017,7 +1018,6 @@ GEM
10171018 msgpack (>= 0.4.3)
10181019 optimist (>= 3.0.0)
10191020 rchardet (1.8.0)
1020− rdoc (6.1.2)
10211021 re2 (1.2.0)
10221022 recaptcha (4.13.1)
10231023 json
@@ -1490,6 +1490,7 @@ DEPENDENCIES
14901490 gitlab-net-dns (~> 0.9.1)
14911491 gitlab-omniauth-openid-connect (~> 0.4.0)
14921492 gitlab-pg_query (~> 2.0.4)
1493+ gitlab-rdoc (~> 6.3.2)
14931494 gitlab-sidekiq-fetcher (= 0.5.6)
14941495 gitlab-styles (~> 6.2.0)
14951496 gitlab_chronic_duration (~> 0.10.6.2)
@@ -1549,7 +1550,7 @@ DEPENDENCIES
15491550 net-ldap (~> 0.16.3)
15501551 net-ntp
15511552 net-ssh (~> 6.0)
1552− nokogiri (~> 1.11.1)
1553+ nokogiri (~> 1.11.4)
15531554 oauth2 (~> 1.4)
15541555 octokit (~> 4.15)
15551556 ohai (~> 16.10)
@@ -1597,7 +1598,6 @@ DEPENDENCIES
15971598 rainbow (~> 3.0)
15981599 rblineprof (~> 0.3.6)
15991600 rbtrace (~> 0.4)
1600− rdoc (~> 6.1.2)
16011601 re2 (~> 1.2.0)
16021602 recaptcha (~> 4.11)
16031603 redis (~> 4.0)
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix+12−12
@@ -2095,6 +2095,16 @@
20952095 };
20962096 version = "2.0.4";
20972097 };
2098+ gitlab-rdoc = {
2099+ groups = ["default"];
2100+ platforms = [];
2101+ source = {
2102+ remotes = ["https://rubygems.org"];
2103+ sha256 = "04vdirkdj42as3rgj6qlgz5ly5vg45i9k184bmf5z556i3b1fyf9";
2104+ type = "gem";
2105+ };
2106+ version = "6.3.2";
2107+ };
20982108 gitlab-sidekiq-fetcher = {
20992109 dependencies = ["sidekiq"];
21002110 groups = ["default"];
@@ -3396,10 +3406,10 @@
33963406 platforms = [];
33973407 source = {
33983408 remotes = ["https://rubygems.org"];
3399− sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
3409+ sha256 = "05rfzi8wksps5pgaavq1n1vkngsrjhqz8rcd1qdb52hnpg9q9p9b";
34003410 type = "gem";
34013411 };
3402− version = "1.11.3";
3412+ version = "1.11.4";
34033413 };
34043414 nokogumbo = {
34053415 dependencies = ["nokogiri"];
@@ -4306,16 +4316,6 @@
43064316 };
43074317 version = "1.8.0";
43084318 };
4309− rdoc = {
4310− groups = ["default"];
4311− platforms = [];
4312− source = {
4313− remotes = ["https://rubygems.org"];
4314− sha256 = "0zh39dpsqlhhi4aba1sbrk504d88p38djk8cansjq0fwndq7w4zb";
4315− type = "gem";
4316− };
4317− version = "6.1.2";
4318− };
43194319 re2 = {
43204320 groups = ["default"];
43214321 platforms = [];