Skip to content

Commit 2fa3b3a

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent e6b06e8 commit 2fa3b3a

File tree

68 files changed

+344
-444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+344
-444
lines changed

‎.markdownlint-cli2.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,3 @@ config:
162162
]
163163
ignores:
164164
- "doc/architecture"
165-
customRules:
166-
- "./doc/.markdownlint/rules/tabs_blank_lines.js"
167-
- "./doc/.markdownlint/rules/tabs_title_markup.js"
168-
- "./doc/.markdownlint/rules/tabs_title_text.js"
169-
- "./doc/.markdownlint/rules/tabs_wrapper_tags.js"

‎.rubocop_todo/gitlab/bounded_contexts.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2312,7 +2312,6 @@ Gitlab/BoundedContexts:
23122312
- 'ee/app/graphql/resolvers/dast_site_validation_resolver.rb'
23132313
- 'ee/app/graphql/resolvers/description_versions_diff_resolver.rb'
23142314
- 'ee/app/graphql/resolvers/dora/performance_scores_count_resolver.rb'
2315-
- 'ee/app/graphql/resolvers/dora_metrics_resolver.rb'
23162315
- 'ee/app/graphql/resolvers/epic_ancestors_resolver.rb'
23172316
- 'ee/app/graphql/resolvers/epic_issues_resolver.rb'
23182317
- 'ee/app/graphql/resolvers/epics/children_resolver.rb'
@@ -2413,10 +2412,6 @@ Gitlab/BoundedContexts:
24132412
- 'ee/app/graphql/types/dora/performance_score_connection_type.rb'
24142413
- 'ee/app/graphql/types/dora/performance_score_count_type.rb'
24152414
- 'ee/app/graphql/types/dora/project_filter_input_type.rb'
2416-
- 'ee/app/graphql/types/dora_metric_bucketing_interval_enum.rb'
2417-
- 'ee/app/graphql/types/dora_metric_type.rb'
2418-
- 'ee/app/graphql/types/dora_metric_type_enum.rb'
2419-
- 'ee/app/graphql/types/dora_type.rb'
24202415
- 'ee/app/graphql/types/epic_descendant_count_type.rb'
24212416
- 'ee/app/graphql/types/epic_descendant_weight_sum_type.rb'
24222417
- 'ee/app/graphql/types/epic_health_status_type.rb'

‎.rubocop_todo/layout/line_length.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,6 @@ Layout/LineLength:
482482
- 'ee/app/graphql/resolvers/app_sec/dast/profile_resolver.rb'
483483
- 'ee/app/graphql/resolvers/board_groupings/epics_resolver.rb'
484484
- 'ee/app/graphql/resolvers/boards/epic_lists_resolver.rb'
485-
- 'ee/app/graphql/resolvers/dora_metrics_resolver.rb'
486485
- 'ee/app/graphql/resolvers/external_issue_resolver.rb'
487486
- 'ee/app/graphql/resolvers/incident_management/oncall_rotations_resolver.rb'
488487
- 'ee/app/graphql/resolvers/incident_management/oncall_schedule_resolver.rb'
@@ -503,7 +502,6 @@ Layout/LineLength:
503502
- 'ee/app/graphql/types/dast_scan_type_enum.rb'
504503
- 'ee/app/graphql/types/dast_scanner_profile_type.rb'
505504
- 'ee/app/graphql/types/dast_site_profile_type.rb'
506-
- 'ee/app/graphql/types/dora_metric_type_enum.rb'
507505
- 'ee/app/graphql/types/epic_health_status_type.rb'
508506
- 'ee/app/graphql/types/epic_sort_enum.rb'
509507
- 'ee/app/graphql/types/epic_type.rb'
@@ -1112,7 +1110,6 @@ Layout/LineLength:
11121110
- 'ee/spec/graphql/resolvers/boards/board_list_epics_resolver_spec.rb'
11131111
- 'ee/spec/graphql/resolvers/ci/code_coverage_activities_resolver_spec.rb'
11141112
- 'ee/spec/graphql/resolvers/dast_site_validation_resolver_spec.rb'
1115-
- 'ee/spec/graphql/resolvers/dora_metrics_resolver_spec.rb'
11161113
- 'ee/spec/graphql/resolvers/epics_resolver_spec.rb'
11171114
- 'ee/spec/graphql/resolvers/external_issue_resolver_spec.rb'
11181115
- 'ee/spec/graphql/resolvers/incident_management/escalation_policies_resolver_spec.rb'

‎.rubocop_todo/style/inline_disable_annotation.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,8 +1093,6 @@ Style/InlineDisableAnnotation:
10931093
- 'ee/app/graphql/types/deployments/approval_type.rb'
10941094
- 'ee/app/graphql/types/dora/performance_score_connection_type.rb'
10951095
- 'ee/app/graphql/types/dora/performance_score_count_type.rb'
1096-
- 'ee/app/graphql/types/dora_metric_type.rb'
1097-
- 'ee/app/graphql/types/dora_type.rb'
10981096
- 'ee/app/graphql/types/epic_descendant_count_type.rb'
10991097
- 'ee/app/graphql/types/epic_descendant_weight_sum_type.rb'
11001098
- 'ee/app/graphql/types/epic_health_status_type.rb'

‎Gemfile.checksum

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -524,13 +524,13 @@
524524
{"name":"prime","version":"0.1.3","platform":"ruby","checksum":"baf031c50d6ce923594913befc8ac86a3251bffb9d6a5e8b03687962054e53e3"},
525525
{"name":"prism","version":"1.2.0","platform":"ruby","checksum":"24ff9cd3232346e68052659f14c9a618022ea98935f774df465206aba5c06d2f"},
526526
{"name":"proc_to_ast","version":"0.1.0","platform":"ruby","checksum":"92a73fa66e2250a83f8589f818b0751bcf227c68f85916202df7af85082f8691"},
527-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"aarch64-linux-gnu","checksum":"7a3e8d7e95f7e53a6870381135f5f4b6c8c3f3b244b7cd760e3582c5abd86512"},
528-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"aarch64-linux-musl","checksum":"87f1cf92f39ce2be861732820c6b719dda4ee9a97b5bf7a627510a45b5a50977"},
529-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"arm64-darwin","checksum":"d828fecea444373367e7d3c7c67c898479816a6400813f641634ba2f64ca91c5"},
530-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"ruby","checksum":"de402deeb56234fb8866bebe91c69410a8f8e377ac557305c688e8e1705f0a75"},
531-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"x86_64-darwin","checksum":"a4501fb9da7a89200e6f8aeaecdbe9e06f491083cac7a611a0c37feeb803adff"},
532-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"x86_64-linux-gnu","checksum":"68cd5e4d0c9be98129f27856f2746c4b21b7162edbe48d71dfd76143097c4b8e"},
533-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"x86_64-linux-musl","checksum":"3f618d48a631a72027d1cfd090a904d4abfd3e543eec10e0d89f456633e35510"},
527+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"aarch64-linux-gnu","checksum":"e2a52234bed534fbce8185b781f49e2a584808a3713fb77287fb3017ae4e8dad"},
528+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"aarch64-linux-musl","checksum":"4d09f7c011cba48ca119515988e1683c4a99fc4310fb33145817541043556f55"},
529+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"arm64-darwin","checksum":"2d5277fe916d76e92a2801685d02bb7da4c8d62ba32e9bb83eb1edc9ad8bb165"},
530+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"ruby","checksum":"20ff9ef443767bc45d338882fbc6a9a853cdae190ec68cfd9395a5ac44384004"},
531+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"x86_64-darwin","checksum":"aab97474ccc96cc707af4be5b26f8d2fe89f4d67013ad996ae10f17712f527ff"},
532+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"x86_64-linux-gnu","checksum":"f17f2b069f73a976b421cf6730974d3addf196656b8437deca9c36845f658f9e"},
533+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"x86_64-linux-musl","checksum":"e2af29e954f40fda4c3acb5c3b9722dbfc724d8d67a28e01904233e558c4ce1d"},
534534
{"name":"pry","version":"0.14.2","platform":"java","checksum":"fd780670977ba04ff7ee32dabd4d02fe4bf02e977afe8809832d5dca1412862e"},
535535
{"name":"pry","version":"0.14.2","platform":"ruby","checksum":"c4fe54efedaca1d351280b45b8849af363184696fcac1c72e0415f9bdac4334d"},
536536
{"name":"pry-byebug","version":"3.10.1","platform":"ruby","checksum":"c8f975c32255bfdb29e151f5532130be64ff3d0042dc858d0907e849125581f8"},

‎Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,7 @@ GEM
14621462
coderay
14631463
parser
14641464
unparser
1465-
prometheus-client-mmap (1.2.8)
1465+
prometheus-client-mmap (1.2.9)
14661466
base64
14671467
bigdecimal
14681468
logger

‎Gemfile.next.checksum

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -529,13 +529,13 @@
529529
{"name":"prime","version":"0.1.3","platform":"ruby","checksum":"baf031c50d6ce923594913befc8ac86a3251bffb9d6a5e8b03687962054e53e3"},
530530
{"name":"prism","version":"1.2.0","platform":"ruby","checksum":"24ff9cd3232346e68052659f14c9a618022ea98935f774df465206aba5c06d2f"},
531531
{"name":"proc_to_ast","version":"0.1.0","platform":"ruby","checksum":"92a73fa66e2250a83f8589f818b0751bcf227c68f85916202df7af85082f8691"},
532-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"aarch64-linux-gnu","checksum":"7a3e8d7e95f7e53a6870381135f5f4b6c8c3f3b244b7cd760e3582c5abd86512"},
533-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"aarch64-linux-musl","checksum":"87f1cf92f39ce2be861732820c6b719dda4ee9a97b5bf7a627510a45b5a50977"},
534-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"arm64-darwin","checksum":"d828fecea444373367e7d3c7c67c898479816a6400813f641634ba2f64ca91c5"},
535-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"ruby","checksum":"de402deeb56234fb8866bebe91c69410a8f8e377ac557305c688e8e1705f0a75"},
536-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"x86_64-darwin","checksum":"a4501fb9da7a89200e6f8aeaecdbe9e06f491083cac7a611a0c37feeb803adff"},
537-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"x86_64-linux-gnu","checksum":"68cd5e4d0c9be98129f27856f2746c4b21b7162edbe48d71dfd76143097c4b8e"},
538-
{"name":"prometheus-client-mmap","version":"1.2.8","platform":"x86_64-linux-musl","checksum":"3f618d48a631a72027d1cfd090a904d4abfd3e543eec10e0d89f456633e35510"},
532+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"aarch64-linux-gnu","checksum":"e2a52234bed534fbce8185b781f49e2a584808a3713fb77287fb3017ae4e8dad"},
533+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"aarch64-linux-musl","checksum":"4d09f7c011cba48ca119515988e1683c4a99fc4310fb33145817541043556f55"},
534+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"arm64-darwin","checksum":"2d5277fe916d76e92a2801685d02bb7da4c8d62ba32e9bb83eb1edc9ad8bb165"},
535+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"ruby","checksum":"20ff9ef443767bc45d338882fbc6a9a853cdae190ec68cfd9395a5ac44384004"},
536+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"x86_64-darwin","checksum":"aab97474ccc96cc707af4be5b26f8d2fe89f4d67013ad996ae10f17712f527ff"},
537+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"x86_64-linux-gnu","checksum":"f17f2b069f73a976b421cf6730974d3addf196656b8437deca9c36845f658f9e"},
538+
{"name":"prometheus-client-mmap","version":"1.2.9","platform":"x86_64-linux-musl","checksum":"e2af29e954f40fda4c3acb5c3b9722dbfc724d8d67a28e01904233e558c4ce1d"},
539539
{"name":"pry","version":"0.14.2","platform":"java","checksum":"fd780670977ba04ff7ee32dabd4d02fe4bf02e977afe8809832d5dca1412862e"},
540540
{"name":"pry","version":"0.14.2","platform":"ruby","checksum":"c4fe54efedaca1d351280b45b8849af363184696fcac1c72e0415f9bdac4334d"},
541541
{"name":"pry-byebug","version":"3.10.1","platform":"ruby","checksum":"c8f975c32255bfdb29e151f5532130be64ff3d0042dc858d0907e849125581f8"},

‎Gemfile.next.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ GEM
14821482
coderay
14831483
parser
14841484
unparser
1485-
prometheus-client-mmap (1.2.8)
1485+
prometheus-client-mmap (1.2.9)
14861486
base64
14871487
bigdecimal
14881488
logger

‎app/assets/javascripts/lib/dompurify.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,19 @@ const getAllowedIconUrls = (gon = window.gon) =>
2828
.filter(Boolean)
2929
.map((path) => relativePathToAbsolute(path, getBaseURL()));
3030

31-
const isUrlAllowed = (url) =>
32-
getAllowedIconUrls().some((allowedUrl) => getNormalizedURL(url).startsWith(allowedUrl));
31+
const isUrlAllowed = (url) => {
32+
try {
33+
const normalizedUrl = new URL(getNormalizedURL(url));
34+
return getAllowedIconUrls().some((allowedUrlString) => {
35+
const allowedUrl = new URL(allowedUrlString);
36+
return (
37+
allowedUrl.origin === normalizedUrl.origin && normalizedUrl.pathname === allowedUrl.pathname
38+
);
39+
});
40+
} catch {
41+
return false;
42+
}
43+
};
3344

3445
const isHrefSafe = (url) => url.match(/^#/) || isUrlAllowed(url);
3546

‎app/controllers/admin/background_migrations_controller.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ class BackgroundMigrationsController < ApplicationController
66
urgency :low
77

88
around_action :support_multiple_databases
9+
authorize! :read_admin_background_migrations, only: [:index, :show]
910

1011
def index
1112
@relations_by_tab = {

0 commit comments

Comments
 (0)