Skip to content

Commit 7fd0523

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 9bc993a commit 7fd0523

File tree

40 files changed

+381
-122
lines changed

40 files changed

+381
-122
lines changed

‎.git-blame-ignore-revs

+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
# This file contains revisions to be ignored by git blame.
2+
# These revisions are expected to be formatting-only changes.
3+
#
4+
# Calling `git blame --ignore-revs-file .git-blame-ignore-revs` will
5+
# tell git blame to ignore changes made by these revisions when assigning
6+
# assigning blame, as if the change never happened.
7+
#
8+
# You can enable this as a default for your local repository by running
9+
# `git config blame.ignoreRevsFile .git-blame-ignore-revs`
10+
# This will probably be automatically picked by your IDE
11+
# (VSCode+GitLens and JetBrains products are confirmed to this)
12+
#
13+
# Important: if you are switching to the branch without this file,
14+
# `git blame` will fail with an error
15+
#
16+
# Guidelines:
17+
# - Only large automated refactorings are expected to be included in this file.
18+
# Do not add new revision just because it feels unimportant
19+
# - When adding sinle revision use inline comment to link relevant issue/MR
20+
# Example:
21+
## d4a8b7307acc2dc8a8833ccfa65426ad28b3ffc9 # https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/60
22+
# - When adding multiple revisions precede each addition (this could be multiple revisions) with a link to
23+
# line with word START and link to relevant issue/MR/epic and conclude with line END and link to the
24+
# same issue/MR/epic
25+
# Example:
26+
# # START https://gitlab.com/gitlab-org/issues/12345
27+
# 6f0bd2d8a1e6cd2e794cd39976e9756e0c85ac66
28+
# d53974df11dbc22cbea9dc7dcbc9896c25979a27
29+
# ... <rest of the list>
30+
# # END https://gitlab.com/gitlab-org/issues/12345
31+
# - Please append new lines to the end of the file, no matter of real chronological
32+
# order of revisions
33+
# - Since this is using hashes for reformatting it might be a good idea to update
34+
# this file in separate MR when relevant changes already landed in master. By
35+
# utilizing this manner you will be safe from random rebase/squash issues
36+
# - Only put full 40-character hashes on this list
37+
38+
# START https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/60
39+
f2d28d7ab8525944fda634241a780006594fbe1a
40+
94cfbb0ce38e893edda33ebc069bfa616a08a961
41+
b69f448f0685ad96edc474f75a17e0278a6d6011
42+
52907ac20c3af337544bdf18023730b9ada4b157
43+
d4a8b7307acc2dc8a8833ccfa65426ad28b3ffc9
44+
468cb9f0a4b88bf686f3e78250834f7c9d31ff76
45+
a536349d1d219f0b79a7a711d37dd1c705e49128
46+
6f0bd2d8a1e6cd2e794cd39976e9756e0c85ac66
47+
d53974df11dbc22cbea9dc7dcbc9896c25979a27
48+
818537524d13469cbc7ac5cb89263378b4cddca4
49+
bcbbcb2e708868099301ad5039badfba2128d47b
50+
a4c662da544b38b7e593eb79f24b24c5cb2f205e
51+
9aa1f6207a91a76940b34c921ce89894fcd74a06
52+
66da09846a17435f332296f73af44919ff2cfb52
53+
216f795bab0e8fbf6023f22f6e54cc07514a04ec
54+
e820c22892d207e138bdff717100e5240f8ffd94
55+
2f8dbd483242575f9ceca0a2947c9b21e5ab59a0
56+
e7d50054818ada29751539f548ef72f46deca8bb
57+
00827a74cf3bfef985ed6046fb2d42f29cbb19ac
58+
333bad893e98068053c888f6b020632f1c6f472e
59+
85af3689eea96b4d9131d80d8c5c8936de520074
60+
325fb305ea395a7f44ae1eea0a3e77e46e10c2b6
61+
e37a6d7aa61039734025474ce901f2907283e239
62+
dff561fa8c50e9b96aec9800b6b88ad6c7a2777b
63+
19b0ba7265cfb154505f74b6856e73662829af2e
64+
7c1fa749efcd59e81b565d6803285f6bd4bcefaf
65+
5c23cb94c5d1aed2a4b02b7c1f3e5a53a0aa4760
66+
c35cc92c80969e7c87bbcda7db6cbd04f6719589
67+
280a79c0ec4c1383e49480f3028f5b2025a2a76b
68+
e94556e9f9a145374bf26feb5e1823dae8a4004d
69+
b6a8d9baf700dbb3f780b27d9a9820c9cb7a346c
70+
9180eaee4d58a9e91c5f960148290b5271ba870c
71+
0fdc1fc0380056836dff7aba9be3b1e4b531daea
72+
157e117fcb530436561e3fb8faba6f751dc19e91
73+
7cfe360c9e5460a595dfe729e81cf404c1106638
74+
e3aca8c8f8488c55a199fc28595709b393f5040b
75+
3b1593f2d53b735299381ad0878959cbc2fc9923
76+
39bb37cc0d18f620006d85dfdff7b9a54077708e
77+
cdc1a4a8eec43e6a3df05403af8d05ab6ea7a213
78+
87ad67fef574cd102887f3dde98917f3b2bbcab8
79+
99bff4450248457ba877dec0388241625fb0144b
80+
d1b6d05c08e0730463084acd1a387cd9d6acea8b
81+
557c22a8242d1d7ccf2228b9b3156e2aa0dd05aa
82+
7f4e951ce8073b50a245ebe216a8961c88846cfa
83+
7dae714f23f423ff362d73e0d16da7b3a6cd721f
84+
cfb368284545a4bd1e759cfe9e3e3bde54a1ec6f
85+
aa653d5a380d88493050b22d84df36ae6df2cddd
86+
96ed4677c602e8f9c83b28fbc0d802aa26527ab8
87+
72c11eb5a15735dc52dcd893e9112a10444d46e4
88+
b48e14b89b94a1a87affabd09bc603a67fc6bb01
89+
d46581c1fbcef34cfdd85c6c542fb4ac1b974861
90+
ef02363c9cd41a9ce41443661efed1c0399c5551
91+
075a78b319466aff9e94149c41c286544af91782
92+
9f4b4de2df17268732ae198d5f48c9b99d071a35
93+
0a8f575e365804239d29b45562ca6594b9da59e9
94+
c04bd24738b1775b963bba3f78b48007fccce37e
95+
1173c801ea53c9d814fdf27d878f73a1702eb4e9
96+
a2f5e7395004c255ecaadef30d7a6b5bf453d372
97+
80f1ea7e3f11063a4f15bdd4a2e4a1ca7f770d87
98+
0e6e345f3b4dcb7b51403bcd096e6d3d294743f4
99+
06ee932e0844fa4cc91c15d5ca581de262d7bedd
100+
b3ece842f7c05230f77055ad11e3c4a07c34e1e9
101+
5ebea3a48831351169e0a312e9d6985b31c9975b
102+
02fad0bc640f5f91c748d692c01d6221c9b03b6e
103+
16d4df3c7130b5a0995fdc685b272bef65ff84d5
104+
281cc7306ab92d2e053d0bb2d79e4f3646b980f6
105+
1877bf550016eac9ecac53ec498ec83bdd24339c
106+
7e9741c59d1e3612017925a7b7cf0946bbdd6eca
107+
b282f7dda6d7e93fcb0f000db8aa6634ac8d1b88
108+
81e82875704ffb35842534433216e797c41f89c3
109+
4914a729d17efbe250ac2cab2153f72caef3a7b7
110+
792e349390327fa11721e2f744cafec3b05f51f4
111+
8869ce0866823b229a863e435aa108c5d4fcf448
112+
a223014afe14686a4e18a826fd0bac9bdaaf969b
113+
482d756cf69e3f0dd5997ea0e58d35c0eb694e35
114+
4700ac1d1da533cfefd50bd640db77a12c458fda
115+
21fa9ca4832cfb57f791ff057e7c5987349aa964
116+
8b24c8d64d9328e0884725a2075a4a21faa76842
117+
86ce5406c3b60757f40d4c434b5ce7dfc602a643
118+
da4eea76b3cc1d68d4bfd2705bb86e904d1b54bc
119+
8ac8a1f21a21840b53175e9f4a423b9ffa083f71
120+
ed189d0e9925eb08f3eb444176fad2614a3a4f83
121+
6e183d5016afc50e60892c7f1cf79035619c2deb
122+
9b1d8b4c2897792be067e33442ebf3ce0961a5d0
123+
57da632154bfc193224d5a290b9c2b6cbd7fa0ad
124+
1e3190b0049ba1b502918dc018681808b9203803
125+
0e334037bf0f93ff6f7bc922c48fa97556f39808
126+
07f5bc94bd983e77361c9a5020f8f229da3a465a
127+
888002a62696ba66d8eb49f1dfe83a5a49bdf421
128+
c152d51445d9d9dd7c2c328ca8c407fa5438d16b
129+
26b68c70df73289210aa600fa3c1fe45f05afee4
130+
# END https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/60

‎.gitlab/ci/cng.gitlab-ci.yml

-51
This file was deleted.

‎.gitlab/ci/review.gitlab-ci.yml

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
include:
2+
- remote: 'https://gitlab.com/gitlab-org/modelops/applied-ml/review-recommender/ci-templates/-/raw/v0.2.1/recommender/Reviewers.gitlab-ci.yml'
3+
14
review-cleanup:
25
extends:
36
- .default-retry
@@ -65,3 +68,9 @@ danger-review-local:
6568
- .review:rules:danger-local
6669
script:
6770
- run_timed_command danger_as_local
71+
72+
reviewers-recommender:
73+
extends:
74+
- .default-retry
75+
stage: test
76+
needs: []

‎.gitlab/ci/rules.gitlab-ci.yml

-9
Original file line numberDiff line numberDiff line change
@@ -623,15 +623,6 @@
623623
- changes: *ci-build-images-patterns
624624
- changes: *code-qa-patterns
625625

626-
#############
627-
# CNG rules #
628-
#############
629-
.cng:rules:
630-
rules:
631-
- <<: *if-dot-com-gitlab-org-and-security-tag
632-
when: manual
633-
allow_failure: true
634-
635626
######################
636627
# CI Templates Rules #
637628
######################

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ gem 'warning', '~> 1.2.0'
345345

346346
group :development do
347347
gem 'lefthook', '~> 0.7.0', require: false
348-
gem 'solargraph', '~> 0.43', require: false
348+
gem 'solargraph', '~> 0.44.3', require: false
349349

350350
gem 'letter_opener_web', '~> 2.0.0'
351351

‎Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ GEM
137137
base32 (0.3.2)
138138
batch-loader (2.0.1)
139139
bcrypt (3.1.16)
140-
benchmark (0.1.1)
140+
benchmark (0.2.0)
141141
benchmark-ips (2.3.0)
142142
benchmark-malloc (0.2.0)
143143
benchmark-memory (0.1.2)
@@ -1223,7 +1223,7 @@ GEM
12231223
slack-messenger (2.3.4)
12241224
snowplow-tracker (0.6.1)
12251225
contracts (~> 0.7, <= 0.11)
1226-
solargraph (0.43.0)
1226+
solargraph (0.44.3)
12271227
backport (~> 1.2)
12281228
benchmark
12291229
bundler (>= 1.17.2)
@@ -1662,7 +1662,7 @@ DEPENDENCIES
16621662
simplecov-lcov (~> 0.8.0)
16631663
slack-messenger (~> 2.3.4)
16641664
snowplow-tracker (~> 0.6.1)
1665-
solargraph (~> 0.43)
1665+
solargraph (~> 0.44.3)
16661666
spamcheck (~> 0.1.0)
16671667
spring (~> 2.1.0)
16681668
spring-commands-rspec (~> 1.0.4)

‎app/helpers/users/callouts_helper.rb

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module CalloutsHelper
99
FEATURE_FLAGS_NEW_VERSION = 'feature_flags_new_version'
1010
REGISTRATION_ENABLED_CALLOUT = 'registration_enabled_callout'
1111
UNFINISHED_TAG_CLEANUP_CALLOUT = 'unfinished_tag_cleanup_callout'
12+
MINUTE_LIMIT_BANNER = 'minute_limit_banner'
1213
SECURITY_NEWSLETTER_CALLOUT = 'security_newsletter_callout'
1314
REGISTRATION_ENABLED_CALLOUT_ALLOWED_CONTROLLER_PATHS = [/^root/, /^dashboard\S*/, /^admin\S*/].freeze
1415

@@ -60,6 +61,10 @@ def show_security_newsletter_user_callout?
6061
!user_dismissed?(SECURITY_NEWSLETTER_CALLOUT)
6162
end
6263

64+
def minute_limit_banner_dismissed?
65+
user_dismissed?(MINUTE_LIMIT_BANNER)
66+
end
67+
6368
private
6469

6570
def user_dismissed?(feature_name, ignore_dismissal_earlier_than = nil)

‎app/models/bulk_imports/entity.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ def encoded_source_full_path
9292
def pipelines
9393
@pipelines ||= case source_type
9494
when 'group_entity'
95-
BulkImports::Groups::Stage.new(bulk_import).pipelines
95+
BulkImports::Groups::Stage.new(self).pipelines
9696
when 'project_entity'
97-
BulkImports::Projects::Stage.new(bulk_import).pipelines
97+
BulkImports::Projects::Stage.new(self).pipelines
9898
end
9999
end
100100

‎app/models/users/callout.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ class Callout < ApplicationRecord
4848
storage_enforcement_banner_third_enforcement_threshold: 45,
4949
storage_enforcement_banner_fourth_enforcement_threshold: 46,
5050
attention_requests_top_nav: 47,
51-
attention_requests_side_nav: 48
51+
attention_requests_side_nav: 48,
52+
minute_limit_banner: 49
5253
}
5354

5455
validates :feature_name,

‎app/views/groups/edit.html.haml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- expanded = expanded_by_default?
55

66
= render 'shared/namespaces/cascading_settings/lock_popovers'
7+
= render_if_exists 'shared/minute_limit_banner', namespace: @group
78

89
%section.settings.gs-general.no-animate.expanded#js-general-settings
910
.settings-header

‎app/views/groups/settings/ci_cd/show.html.haml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
- expanded = expanded_by_default?
55
- general_expanded = @group.errors.empty? ? expanded : true
6+
= render_if_exists 'shared/minute_limit_banner', namespace: @group
67

78
-# Given we only have one field in this form which is also admin-only,
89
-# we don't want to show an empty section to non-admin users,

‎app/views/groups/show.html.haml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
= render_if_exists 'shared/qrtly_reconciliation_alert', group: @group
1010
= render_if_exists 'shared/user_over_limit_free_plan_alert', source: @group
11+
= render_if_exists 'shared/minute_limit_banner', namespace: @group
1112

1213
- if show_invite_banner?(@group)
1314
= content_for :group_invite_members_banner do

‎app/views/projects/edit.html.haml

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
- expanded = expanded_by_default?
66
- reduce_visibility_form_id = 'reduce-visibility-form'
77

8+
= render_if_exists 'shared/minute_limit_banner', namespace: @project
9+
810
%section.settings.general-settings.no-animate.expanded#js-general-settings
911
.settings-header
1012
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Naming, topics, avatar')

‎app/views/projects/jobs/index.html.haml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
= render_if_exists 'shared/minute_limit_banner', namespace: @project
2+
13
- page_title _("Jobs")
24
- add_page_specific_style 'page_bundles/ci_status'
35
- admin = local_assigns.fetch(:admin, false)

‎app/views/projects/pipeline_schedules/index.html.haml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
= render_if_exists 'shared/minute_limit_banner', namespace: @project
2+
13
- breadcrumb_title _("Schedules")
24
- page_title _("Pipeline Schedules")
35
- add_page_specific_style 'page_bundles/pipeline_schedules'

‎app/views/projects/pipelines/index.html.haml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
= render_if_exists 'shared/minute_limit_banner', namespace: @project
2+
13
- page_title _('Pipelines')
24
- add_page_specific_style 'page_bundles/pipelines'
35
- add_page_specific_style 'page_bundles/ci_status'

‎app/views/projects/settings/ci_cd/show.html.haml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
= render_if_exists 'shared/minute_limit_banner', namespace: @project
2+
13
- @content_class = "limit-container-width" unless fluid_layout
24
- page_title _("CI/CD Settings")
35
- page_title _("CI/CD")

‎app/views/projects/show.html.haml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
= auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity")
88

99
= render_if_exists 'shared/user_over_limit_free_plan_alert', source: @project
10+
= render_if_exists 'shared/minute_limit_banner', namespace: @project
1011
= render partial: 'flash_messages', locals: { project: @project }
1112

1213
= render "projects/last_push"

‎config/feature_flags/development/ci_trigger_forward_variables.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355572
55
milestone: '14.9'
66
type: development
77
group: group::pipeline authoring
8-
default_enabled: false
8+
default_enabled: true

‎config/feature_flags/development/container_security_policy_selection.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353071
55
milestone: '14.10'
66
type: development
77
group: group::container security
8-
default_enabled: false
8+
default_enabled: true

‎config/feature_flags/development/show_minute_limit_banner.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
name: show_minute_limit_banner
3+
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84644
4+
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358191
5+
milestone: '14.10'
6+
type: development
7+
group: group::workspace
8+
default_enabled: false

‎db/fixtures/development/33_triage_ops.rb

+4
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@ def seed!
1414
Sidekiq::Testing.inline! do
1515
puts "Ensuring required groups"
1616
ensure_group('gitlab-com')
17+
ensure_group('gitlab-com/gl-security/appsec')
1718
ensure_group('gitlab-jh/jh-team')
1819
ensure_group('gitlab-org')
1920
ensure_group('gitlab-org/gitlab-core-team/community-members')
2021
ensure_group('gitlab-org/security')
22+
2123
puts "Ensuring required projects"
2224
ensure_project('gitlab-org/gitlab')
2325
ensure_project('gitlab-org/security/gitlab')
26+
2427
puts "Ensuring required bot user"
2528
ensure_bot_user
29+
2630
puts "Setting up webhooks"
2731
ensure_webhook_for('gitlab-com')
2832
ensure_webhook_for('gitlab-org')

0 commit comments

Comments
 (0)