Skip to content

Commit 051d825

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent eb5145f commit 051d825

File tree

76 files changed

+175
-200
lines changed

Some content is hidden

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

76 files changed

+175
-200
lines changed

‎DUO_WORKFLOW_EXECUTOR_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.33
1+
0.0.34

‎app/assets/javascripts/gitlab_version_check/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Vue from 'vue';
22
import { parseBoolean, convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
3-
import GitlabVersionCheckBadge from './components/gitlab_version_check_badge.vue';
3+
import GitlabVersionCheckBadge from 'jh_else_ce/gitlab_version_check/components/gitlab_version_check_badge.vue';
44
import SecurityPatchUpgradeAlertModal from './components/security_patch_upgrade_alert_modal.vue';
55

66
const mountGitlabVersionCheckBadge = (el) => {

‎app/assets/javascripts/issuable/popover/components/issue_popover.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export default {
5656
},
5757
data() {
5858
return {
59+
shouldFetch: false,
5960
workItem: {},
6061
};
6162
},
@@ -69,6 +70,9 @@ export default {
6970
};
7071
},
7172
update: (data) => data.namespace?.workItem || {},
73+
skip() {
74+
return !this.shouldFetch;
75+
},
7276
},
7377
},
7478
computed: {
@@ -103,7 +107,13 @@ export default {
103107
</script>
104108
105109
<template>
106-
<gl-popover :target="target" boundary="viewport" placement="top" :show="show">
110+
<gl-popover
111+
:target="target"
112+
boundary="viewport"
113+
placement="top"
114+
:show="show"
115+
@show="shouldFetch = true"
116+
>
107117
<gl-skeleton-loader v-if="$apollo.queries.workItem.loading" :width="150" />
108118
<template v-else>
109119
<div class="gl-flex gl-items-center gl-gap-2">

‎app/assets/javascripts/super_sidebar/components/help_center.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script>
22
import { GlBadge, GlButton, GlDisclosureDropdown, GlDisclosureDropdownGroup } from '@gitlab/ui';
3-
import GitlabVersionCheckBadge from '~/gitlab_version_check/components/gitlab_version_check_badge.vue';
3+
import GitlabVersionCheckBadge from 'jh_else_ce/gitlab_version_check/components/gitlab_version_check_badge.vue';
44
import { helpPagePath } from '~/helpers/help_page_helper';
55
import { FORUM_URL, PROMO_URL } from '~/constants';
66
import { __ } from '~/locale';

‎app/assets/javascripts/vue_shared/components/source_viewer/plugins/wrap_child_nodes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ const generateHLJSTag = (scope, content = '', includeClose) =>
1717
const format = (node, scope = '') => {
1818
let buffer = '';
1919

20-
if (typeof node === 'string') {
20+
if (typeof node === 'string' && node.length) {
2121
buffer += node
2222
.split(newlineRegex)
23-
.map((newline) => generateHLJSTag(scope, newline, true))
23+
.map((newline) => (newline.length ? generateHLJSTag(scope, newline, true) : ''))
2424
.join('\n');
2525
} else if (node.children) {
2626
const { children } = node;

‎app/assets/javascripts/work_items/components/notes/work_item_notes_loading.vue

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
1-
<script>
2-
import { GlSkeletonLoader } from '@gitlab/ui';
3-
4-
export default {
5-
components: {
6-
GlSkeletonLoader,
7-
},
8-
loader: {
9-
repeat: 10,
10-
width: 1000,
11-
height: 40,
12-
},
13-
};
14-
</script>
15-
161
<template>
172
<div>
18-
<gl-skeleton-loader
19-
v-for="index in $options.loader.repeat"
20-
:key="index"
21-
:width="$options.loader.width"
22-
:height="$options.loader.height"
23-
preserve-aspect-ratio="xMinYMax meet"
24-
>
25-
<circle cx="20" cy="20" r="16" />
26-
<rect width="512" x="45" y="15" height="10" rx="4" />
27-
</gl-skeleton-loader>
3+
<div v-for="index in 10" :key="index" class="gl-flex gl-items-center gl-gap-3">
4+
<div
5+
class="gl-animate-skeleton-loader gl-my-3 gl-h-7 gl-w-7 gl-shrink-0 gl-rounded-full"
6+
></div>
7+
<div
8+
class="gl-animate-skeleton-loader gl-my-3 gl-h-5 gl-w-75 gl-max-w-full gl-rounded-base"
9+
></div>
10+
</div>
2811
</div>
2912
</template>

‎app/assets/javascripts/work_items/components/work_item_loading.vue

Lines changed: 64 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,88 @@
11
<script>
2-
import { GlSkeletonLoader } from '@gitlab/ui';
32
import WorkItemNotesLoading from '~/work_items/components/notes/work_item_notes_loading.vue';
43
54
export default {
65
name: 'WorkItemLoading',
76
loader: {
8-
descriptionRepeat: 2,
97
attributesRepeat: 6,
108
},
119
components: {
12-
GlSkeletonLoader,
1310
WorkItemNotesLoading,
1411
},
1512
};
1613
</script>
1714

1815
<template>
19-
<div class="work-item-overview" data-testid="work-item-two-column-loading">
20-
<section>
21-
<gl-skeleton-loader :height="60" :width="600" data-testid="work-title-and-meta-loading">
22-
<!--- START work item title -->
23-
<rect width="500" height="20" x="5" y="0" rx="4" />
24-
<!--- END work item title -->
25-
<!--- START work item meta -->
26-
<rect width="50" height="15" x="5" y="30" rx="6" />
27-
<rect width="150" height="5" x="60" y="35" rx="2" />
28-
<!--- END work item meta -->
29-
</gl-skeleton-loader>
16+
<div>
17+
<div class="gl-mb-5" data-testid="work-title-and-meta-loading">
18+
<div
19+
class="gl-animate-skeleton-loader gl-mb-2 gl-h-8 gl-w-88 gl-max-w-full gl-rounded-base"
20+
></div>
21+
<div class="gl-flex gl-items-center gl-gap-3">
22+
<div class="gl-animate-skeleton-loader gl-my-2 gl-h-6 gl-w-11 gl-rounded-pill"></div>
23+
<div class="gl-animate-skeleton-loader gl-my-2 gl-h-4 gl-w-13 gl-rounded-base"></div>
24+
</div>
25+
</div>
26+
<div class="work-item-overview" data-testid="work-item-two-column-loading">
27+
<section>
28+
<!--- START work item description -->
29+
<div class="gl-mb-6 gl-mt-5" data-testid="work-item-description-loading">
30+
<div
31+
v-for="i in 4"
32+
:key="i"
33+
class="gl-animate-skeleton-loader gl-my-3 gl-h-4 gl-max-w-full gl-rounded-base"
34+
></div>
35+
<div
36+
class="gl-animate-skeleton-loader gl-my-3 gl-h-4 gl-max-w-[95%] gl-rounded-base"
37+
></div>
38+
</div>
39+
<!--- END work item description -->
3040

31-
<!--- START work item description -->
32-
<div data-testid="work-item-description-loading">
33-
<gl-skeleton-loader
34-
v-for="i in $options.loader.descriptionRepeat"
35-
:key="i"
36-
:width="600"
37-
:height="20"
41+
<div
42+
class="work-item-attributes-wrapper gl-my-6 md:!gl-hidden"
43+
data-testid="work-item-attributes-xssm-loading"
3844
>
39-
<rect width="500" x="5" y="0" height="5" rx="2" />
40-
<rect width="595" x="5" y="10" height="5" rx="2" />
41-
</gl-skeleton-loader>
42-
43-
<gl-skeleton-loader :width="600" :height="20">
44-
<rect width="300" x="5" y="0" height="5" rx="2" />
45-
</gl-skeleton-loader>
45+
<div v-for="i in $options.loader.attributesRepeat" :key="i">
46+
<div
47+
class="gl-animate-skeleton-loader gl-my-3 gl-h-3 gl-max-w-[20%] gl-rounded-base"
48+
></div>
49+
<div
50+
class="gl-animate-skeleton-loader gl-mb-7 gl-h-4 gl-max-w-full gl-rounded-base"
51+
></div>
52+
</div>
53+
</div>
54+
<!--- END work item attributes wrapper small/xs screen -->
4655

47-
<gl-skeleton-loader :width="600" :height="20">
48-
<rect width="500" x="5" y="0" height="5" rx="2" />
49-
<rect width="595" x="5" y="10" height="5" rx="2" />
50-
</gl-skeleton-loader>
56+
<!--- START work item notes activity placeholder -->
57+
<div
58+
class="gl-animate-skeleton-loader gl-my-6 gl-h-7 gl-w-20 gl-max-w-full gl-rounded-base"
59+
data-testid="work-item-activity-placeholder-loading"
60+
></div>
5161

52-
<gl-skeleton-loader :width="600" :height="20">
53-
<rect width="300" x="5" y="0" height="5" rx="2" />
54-
</gl-skeleton-loader>
55-
</div>
56-
<!--- END work item description -->
62+
<!--- END work item notes activity placeholder -->
5763

58-
<!--- START work item attributes wrapper small/xs screen -->
59-
<div
60-
class="work-item-attributes-wrapper md:!gl-hidden"
61-
data-testid="work-item-attributes-xssm-loading"
62-
>
63-
<gl-skeleton-loader
64-
v-for="i in $options.loader.attributesRepeat"
65-
:key="i"
66-
:width="240"
67-
:height="20"
68-
>
69-
<rect width="50" x="2" y="0" height="2" rx="1" />
70-
<rect width="100" x="2" y="5" height="4" rx="1" />
71-
</gl-skeleton-loader>
72-
</div>
73-
<!--- END work item attributes wrapper small/xs screen -->
64+
<!--- START work item notes -->
65+
<work-item-notes-loading />
66+
<!--- END work item notes -->
67+
</section>
7468

75-
<!--- START work item notes activity placeholder -->
76-
<gl-skeleton-loader
77-
:height="30"
78-
:width="600"
79-
data-testid="work-item-activity-placeholder-loading"
69+
<!--- START work item attributes wrapper md/lg screens -->
70+
<aside
71+
class="work-item-overview-right-sidebar gl-hidden md:!gl-block"
72+
data-testid="work-item-attributes-mdup-loading"
8073
>
81-
<rect width="100" height="15" x="5" y="0" rx="4" />
82-
</gl-skeleton-loader>
83-
<!--- END work item notes activity placeholder -->
84-
85-
<!--- START work item notes -->
86-
<work-item-notes-loading />
87-
<!--- END work item notes -->
88-
</section>
89-
90-
<!--- START work item attributes wrapper md/lg screens -->
91-
<aside
92-
class="work-item-overview-right-sidebar gl-hidden md:!gl-block"
93-
data-testid="work-item-attributes-mdup-loading"
94-
>
95-
<div class="work-item-attributes-wrapper">
96-
<gl-skeleton-loader
97-
v-for="i in $options.loader.attributesRepeat"
98-
:key="i"
99-
:width="240"
100-
:height="50"
101-
>
102-
<rect width="100" x="0" y="25" height="5" rx="4" />
103-
<rect width="240" x="0" y="35" height="10" rx="4" />
104-
</gl-skeleton-loader>
105-
</div>
106-
</aside>
107-
<!--- END work item attributes wrapper md/lg screens -->
74+
<div class="work-item-attributes-wrapper">
75+
<div v-for="i in $options.loader.attributesRepeat" :key="i">
76+
<div
77+
class="gl-animate-skeleton-loader gl-my-3 gl-h-3 gl-max-w-[20%] gl-rounded-base"
78+
></div>
79+
<div
80+
class="gl-animate-skeleton-loader gl-mb-7 gl-h-4 gl-max-w-full gl-rounded-base"
81+
></div>
82+
</div>
83+
</div>
84+
</aside>
85+
<!--- END work item attributes wrapper md/lg screens -->
86+
</div>
10887
</div>
10988
</template>

‎app/assets/javascripts/work_items/components/work_item_parent.vue

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script>
22
import { GlIcon, GlLink, GlPopover } from '@gitlab/ui';
3-
3+
import { uniqueId } from 'lodash';
44
import * as Sentry from '~/sentry/sentry_browser_wrapper';
55
import { s__ } from '~/locale';
66
import WorkItemSidebarDropdownWidget from '~/work_items/components/shared/work_item_sidebar_dropdown_widget.vue';
@@ -24,6 +24,7 @@ import {
2424
import { findHierarchyWidgetDefinition, isReference, newWorkItemId } from '../utils';
2525
2626
export default {
27+
linkId: uniqueId('work-item-parent-link-'),
2728
name: 'WorkItemParent',
2829
components: {
2930
GlLink,
@@ -104,9 +105,6 @@ export default {
104105
workItems() {
105106
return this.availableWorkItems?.map(({ id, title }) => ({ text: title, value: id })) || [];
106107
},
107-
parentFullPath() {
108-
return this.parent?.namespace.fullPath;
109-
},
110108
parentWebUrl() {
111109
return this.parent?.webUrl;
112110
},
@@ -323,17 +321,18 @@ export default {
323321
<template #readonly>
324322
<template v-if="localSelectedItem">
325323
<gl-link
326-
ref="link"
324+
:id="$options.linkId"
327325
data-testid="work-item-parent-link"
328326
class="gl-inline-block gl-max-w-full gl-overflow-hidden gl-text-ellipsis gl-whitespace-nowrap gl-align-top gl-text-default"
329327
:href="parentWebUrl"
330328
>{{ listboxText }}</gl-link
331329
>
332330
<issue-popover
331+
v-if="parent"
333332
:cached-title="parent.title"
334333
:iid="parent.iid"
335-
:namespace-path="parentFullPath"
336-
:target="() => $refs.link.$el"
334+
:namespace-path="parent.namespace.fullPath"
335+
:target="$options.linkId"
337336
/>
338337
</template>
339338
</template>

‎app/models/ci/job_token/allowlist_migration_task.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@ def log_error(project, message)
7878
end
7979

8080
def perform_migration!(project)
81-
track_internal_event(
82-
'ci_job_token_autopopulate_allowlist',
83-
user: @user,
84-
project: project,
85-
additional_properties: {
86-
label: 'rake'
87-
}
88-
)
8981
::Ci::JobToken::AutopopulateAllowlistService # rubocop:disable CodeReuse/ServiceClass -- This class is not an ActiveRecord model
9082
.new(project, @user)
9183
.unsafe_execute!

‎doc/administration/dedicated/img/tenant_network_diagram_v18_0.png

-213 KB
Loading

‎doc/administration/geo/replication/datatypes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ successfully, you must replicate their data using some other means.
227227
| [Server-side Git hooks](../../server_hooks.md) | [Not planned](https://gitlab.com/groups/gitlab-org/-/epics/1867) | No | Not applicable | Not applicable | Not planned because of current implementation complexity, low customer interest, and availability of alternatives to hooks. |
228228
| [Elasticsearch integration](../../../integration/advanced_search/elasticsearch.md) | [Not planned](https://gitlab.com/gitlab-org/gitlab/-/issues/1186) | No | No | No | Not planned because further product discovery is required and Elasticsearch (ES) clusters can be rebuilt. Secondaries use the same ES cluster as the primary. |
229229
| [Dependency Proxy Images](../../../user/packages/dependency_proxy/_index.md) | [**Yes** (15.7)](https://gitlab.com/groups/gitlab-org/-/epics/8833) | [**Yes** (15.7)](https://gitlab.com/groups/gitlab-org/-/epics/8833) | [**Yes** (15.7)](https://gitlab.com/groups/gitlab-org/-/epics/8833) | [**Yes** (16.4)<sup>3</sup>](https://gitlab.com/groups/gitlab-org/-/epics/8056) | |
230-
| [Vulnerability Export](../../../user/application_security/vulnerability_report/_index.md#export-vulnerability-details) | [Not planned](https://gitlab.com/groups/gitlab-org/-/epics/3111) | No | No | No | Not planned because they are ephemeral and sensitive information. They can be regenerated on demand. |
230+
| [Vulnerability Export](../../../user/application_security/vulnerability_report/_index.md#exporting) | [Not planned](https://gitlab.com/groups/gitlab-org/-/epics/3111) | No | No | No | Not planned because they are ephemeral and sensitive information. They can be regenerated on demand. |
231231
| Packages NPM metadata cache | [Not planned](https://gitlab.com/gitlab-org/gitlab/-/issues/408278) | No | No | No | Not planned because it would not notably improve disaster recovery capabilities nor response times at secondary sites. |
232232

233233
**Footnotes:**

‎doc/administration/geo/secondary_proxy/img/secondary_proxy_read_only_v17_8.png

-21.5 KB
Loading

‎doc/administration/img/geo_primary_uploads_verification_v17_11.png

-25.4 KB
Loading

‎doc/administration/img/geo_secondary_uploads_inconsistencies_v17_11.png

-24.8 KB
Loading

‎doc/administration/img/gitlab_duo_self_hosted_disable_feature_v17_11.png

-99.9 KB
Loading

‎doc/administration/img/gitlab_duo_self_hosted_feature_configuration_v17_11.png

-61.1 KB
Loading

‎doc/api/graphql/reference/_index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44220,7 +44220,6 @@ Values for sorting projects.
4422044220
| <a id="namespaceprojectsortsimilarity"></a>`SIMILARITY` | Most similar to the search query. |
4422144221
| <a id="namespaceprojectsortsnippets_size_asc"></a>`SNIPPETS_SIZE_ASC` | Sort by total snippet size, ascending order. |
4422244222
| <a id="namespaceprojectsortsnippets_size_desc"></a>`SNIPPETS_SIZE_DESC` | Sort by total snippet size, descending order. |
44223-
| <a id="namespaceprojectsortstorage"></a>`STORAGE` {{< icon name="warning-solid" >}} | **Deprecated** in GitLab 16.9. Please use EXCESS_REPO_STORAGE_SIZE_DESC. |
4422444223
| <a id="namespaceprojectsortstorage_size_asc"></a>`STORAGE_SIZE_ASC` | Sort by total storage size, ascending order. |
4422544224
| <a id="namespaceprojectsortstorage_size_desc"></a>`STORAGE_SIZE_DESC` | Sort by total storage size, descending order. |
4422644225
| <a id="namespaceprojectsortwiki_size_asc"></a>`WIKI_SIZE_ASC` | Sort by total wiki size, ascending order. |

‎doc/api/job_artifacts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ artifacts are searched in hierarchical order from parent to child. If both paren
212212
have a job with the same name, the artifact from the parent pipeline is returned.
213213

214214
The artifact file provides more detail than what is available in the
215-
[CSV export](../user/application_security/vulnerability_report/_index.md#export-vulnerability-details).
215+
[CSV export](../user/application_security/vulnerability_report/_index.md#exporting).
216216

217217
Prerequisites:
218218

0 commit comments

Comments
 (0)