Skip to content

Commit b6611ae

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 4722868 commit b6611ae

File tree

51 files changed

+1248
-256
lines changed

Some content is hidden

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

51 files changed

+1248
-256
lines changed

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

+11
Original file line numberDiff line numberDiff line change
@@ -3351,14 +3351,25 @@
33513351
- <<: *if-merge-request-labels-run-observability-e2e-tests-current-branch
33523352
when: never
33533353
- <<: *if-merge-request-labels-run-observability-e2e-tests-main-branch
3354+
allow_failure: true
33543355
- <<: *if-merge-request
33553356
changes: *observability-code-patterns
3357+
allow_failure: true
3358+
- <<: *if-merge-request
3359+
changes: *code-patterns
3360+
when: manual
3361+
allow_failure: true
33563362

33573363
.observability-backend-current-branch:rules:
33583364
rules:
33593365
- <<: *if-merge-request-labels-run-observability-e2e-tests-main-branch
33603366
when: never
33613367
- <<: *if-merge-request-labels-run-observability-e2e-tests-current-branch
3368+
allow_failure: true
3369+
- <<: *if-merge-request
3370+
changes: *code-patterns
3371+
when: manual
3372+
allow_failure: true
33623373

33633374
##########################
33643375
# Pre-merge checks rules #

‎.rubocop_todo/layout/line_length.yml

-5
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,6 @@ Layout/LineLength:
184184
- 'app/helpers/import_helper.rb'
185185
- 'app/helpers/issuables_helper.rb'
186186
- 'app/helpers/labels_helper.rb'
187-
- 'app/helpers/merge_requests_helper.rb'
188-
- 'app/helpers/mirror_helper.rb'
189-
- 'app/helpers/nav/new_dropdown_helper.rb'
190-
- 'app/helpers/nav_helper.rb'
191-
- 'app/helpers/notify_helper.rb'
192187
- 'app/helpers/operations_helper.rb'
193188
- 'app/helpers/packages_helper.rb'
194189
- 'app/helpers/preferences_helper.rb'

‎GITALY_SERVER_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0449fac4772470bb53aec66a54cf671b2116d4f3
1+
f5742bf5cd567c3bfc02aca8880bc8f73a7fb7c4

‎app/assets/javascripts/ci/job_details/components/job_header.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ export default {
106106
</template>
107107
108108
<template #description>
109-
<ci-icon class="gl-mr-3" :status="status" show-status-text />
109+
<ci-icon class="gl-mr-1" :status="status" show-status-text />
110110
<template v-if="shouldRenderTriggeredLabel">{{ __('Started') }}</template>
111111
<template v-else>{{ __('Created') }}</template>
112112
113-
<timeago-tooltip :time="time" class="gl-mx-2" />
113+
<timeago-tooltip :time="time" />
114114
115115
{{ __('by') }}
116116
@@ -127,7 +127,7 @@ export default {
127127
:size="24"
128128
:src="avatarUrl"
129129
:label="user.name"
130-
class="gl-mx-1 gl-hidden sm:gl-inline-flex"
130+
class="gl-hidden sm:gl-inline-flex"
131131
/>
132132
<strong class="author gl-inline sm:gl-hidden">@{{ user.username }}</strong>
133133
<gl-tooltip v-if="message" :target="() => $refs[$options.EMOJI_REF]">

‎app/assets/javascripts/groups_projects/components/filtered_search_and_sort.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export default {
113113
</script>
114114

115115
<template>
116-
<div class="gl-border-t gl-border-b gl-bg-gray-10 gl-p-5">
116+
<div class="gl-border-t gl-bg-subtle gl-p-5">
117117
<div class="gl-flex gl-flex-col gl-gap-3 md:gl-flex-row">
118118
<div class="gl-grow">
119119
<filtered-search-bar

‎app/assets/javascripts/ide/components/ide.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export default {
166166
<div class="ide-empty-state">
167167
<div class="row js-empty-state">
168168
<div class="col-12">
169-
<div class="svg-content svg-250"><img :src="emptyStateSvgPath" /></div>
169+
<div class="svg-content svg-150"><img :src="emptyStateSvgPath" /></div>
170170
</div>
171171
<div class="col-12">
172172
<div class="text-content text-center">

‎app/assets/javascripts/ide/init_legacy_web_ide.js

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export const initLegacyWebIDE = (el, options = {}) => {
3434
noChangesStateSvgPath: el.dataset.noChangesStateSvgPath,
3535
committedStateSvgPath: el.dataset.committedStateSvgPath,
3636
pipelinesEmptyStateSvgPath: el.dataset.pipelinesEmptyStateSvgPath,
37-
promotionSvgPath: el.dataset.promotionSvgPath,
3837
switchEditorSvgPath: el.dataset.switchEditorSvgPath,
3938
});
4039
this.setLinks({

‎app/assets/javascripts/ide/stores/mutations.js

-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ export default {
107107
noChangesStateSvgPath,
108108
committedStateSvgPath,
109109
pipelinesEmptyStateSvgPath,
110-
promotionSvgPath,
111110
switchEditorSvgPath,
112111
},
113112
) {
@@ -116,7 +115,6 @@ export default {
116115
noChangesStateSvgPath,
117116
committedStateSvgPath,
118117
pipelinesEmptyStateSvgPath,
119-
promotionSvgPath,
120118
switchEditorSvgPath,
121119
});
122120
},

‎app/assets/stylesheets/framework/mixins.scss

+1
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
min-height: $height;
212212
padding: $grid-size;
213213
@apply gl-bg-section gl-border gl-border-section gl-text-default;
214+
box-shadow: 0 -6px 0 0 var(--gl-background-color-default);
214215
}
215216

216217
@mixin job-log-top-bar {

‎app/assets/stylesheets/pages/groups.scss

-6
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@
3838
}
3939
}
4040

41-
.groups-list-tree-container {
42-
> .group-list-tree > .group-row.has-children:first-child {
43-
border-top: 0;
44-
}
45-
}
46-
4741
.group-list-tree {
4842
.folder-toggle-wrap {
4943
font-size: 0;

‎app/graphql/mutations/ci/job_token_scope/update_job_token_policies.rb

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# frozen_string_literal: true
2+
3+
module Mutations
4+
module Ci
5+
module JobTokenScope
6+
class UpdateJobTokenPolicies < BaseMutation
7+
graphql_name 'CiJobTokenScopeUpdatePolicies'
8+
9+
include FindsProject
10+
11+
authorize :admin_project
12+
13+
argument :project_path, GraphQL::Types::ID,
14+
required: true,
15+
description: 'Project that the CI job token scope belongs to.'
16+
17+
argument :target_path, GraphQL::Types::ID,
18+
required: true,
19+
description: 'Group or project that the CI job token targets.'
20+
21+
argument :job_token_policies, [Types::Ci::JobTokenScope::PoliciesEnum],
22+
required: true,
23+
description: 'List of policies added to the CI job token scope.'
24+
25+
field :ci_job_token_scope,
26+
Types::Ci::JobTokenScopeType,
27+
null: true,
28+
description: 'Updated CI job token access scope.'
29+
30+
def resolve(project_path:, target_path:, job_token_policies:)
31+
project = authorized_find!(project_path)
32+
target = find_target_using_path(target_path)
33+
34+
unless Feature.enabled?(:add_policies_to_ci_job_token, project)
35+
raise_resource_not_available_error! '`add_policies_to_ci_job_token` feature flag is disabled.'
36+
end
37+
38+
result = ::Ci::JobTokenScope::UpdatePoliciesService
39+
.new(project, current_user)
40+
.execute(target, job_token_policies)
41+
42+
{
43+
ci_job_token_scope: ::Ci::JobToken::Scope.new(project),
44+
errors: result.errors
45+
}
46+
end
47+
48+
private
49+
50+
def find_target_using_path(target_path)
51+
::Group.find_by_full_path(target_path) ||
52+
::Project.find_by_full_path(target_path)
53+
end
54+
end
55+
end
56+
end
57+
end

‎app/graphql/mutations/import/source_users/keep_all_as_placeholder.rb

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# frozen_string_literal: true
2+
3+
module Mutations
4+
module Import
5+
module SourceUsers
6+
class KeepAllAsPlaceholder < BaseMutation
7+
graphql_name 'ImportSourceUserKeepAllAsPlaceholder'
8+
9+
argument :namespace_id, Types::GlobalIDType[::Namespace],
10+
required: true,
11+
description: 'Global ID of the namespace.'
12+
13+
field :updated_import_source_user_count,
14+
GraphQL::Types::Int,
15+
null: true,
16+
description: "Number of successfully updated mappings of users on source instance to their destination users."
17+
18+
authorize :admin_namespace
19+
20+
def resolve(args)
21+
if Feature.disabled?(:importer_user_mapping, current_user)
22+
raise_resource_not_available_error! '`importer_user_mapping` feature flag is disabled.'
23+
end
24+
25+
namespace = authorized_find!(id: args[:namespace_id])
26+
result = ::Import::SourceUsers::KeepAllAsPlaceholderService.new(namespace, current_user: current_user).execute
27+
28+
{ updated_import_source_user_count: result.payload, errors: result.errors }
29+
end
30+
end
31+
end
32+
end
33+
end

‎app/graphql/types/mutation_type.rb

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class MutationType < BaseObject
6060
mount_mutation Mutations::Environments::Stop
6161
mount_mutation Mutations::Environments::Update
6262
mount_mutation Mutations::Import::SourceUsers::CancelReassignment, alpha: { milestone: '17.2' }
63+
mount_mutation Mutations::Import::SourceUsers::KeepAllAsPlaceholder, alpha: { milestone: '17.6' }
6364
mount_mutation Mutations::Import::SourceUsers::KeepAsPlaceholder, alpha: { milestone: '17.2' }
6465
mount_mutation Mutations::Import::SourceUsers::Reassign, alpha: { milestone: '17.2' }
6566
mount_mutation Mutations::Import::SourceUsers::ResendNotification, alpha: { milestone: '17.2' }
@@ -173,6 +174,7 @@ class MutationType < BaseObject
173174
mount_mutation Mutations::Ci::JobArtifact::Destroy
174175
mount_mutation Mutations::Ci::JobTokenScope::RemoveGroup
175176
mount_mutation Mutations::Ci::JobTokenScope::RemoveProject
177+
mount_mutation Mutations::Ci::JobTokenScope::UpdateJobTokenPolicies, alpha: { milestone: '17.6' }
176178
mount_mutation Mutations::Ci::Pipeline::Cancel
177179
mount_mutation Mutations::Ci::Pipeline::Destroy
178180
mount_mutation Mutations::Ci::Pipeline::Retry

‎app/helpers/ide_helper.rb

+3-4
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,18 @@ def new_ide_data(project:)
8989

9090
def legacy_ide_data(project:)
9191
{
92-
'empty-state-svg-path' => image_path('illustrations/multi_file_editor_empty.svg'),
93-
'no-changes-state-svg-path' => image_path('illustrations/multi-editor_no_changes_empty.svg'),
92+
'empty-state-svg-path' => image_path('illustrations/empty-state/empty-variables-md.svg'),
93+
'no-changes-state-svg-path' => image_path('illustrations/status/status-nothing-sm.svg'),
9494
'committed-state-svg-path' => image_path('illustrations/rocket-launch-md.svg'),
9595
'pipelines-empty-state-svg-path': image_path('illustrations/empty-state/empty-pipeline-md.svg'),
9696
'switch-editor-svg-path': image_path('illustrations/rocket-launch-md.svg'),
97-
'promotion-svg-path': image_path('illustrations/web-ide_promotion.svg'),
9897
'ci-help-page-path' => help_page_path('ci/quick_start/index.md'),
9998
'web-ide-help-page-path' => help_page_path('user/project/web_ide/index.md'),
10099
'render-whitespace-in-code': current_user.render_whitespace_in_code.to_s,
101100
'default-branch' => project && project.default_branch,
102101
'project' => convert_to_project_entity_json(project),
103102
'preview-markdown-path' => project && preview_markdown_path(project),
104-
'web-terminal-svg-path' => image_path('illustrations/web-ide_promotion.svg'),
103+
'web-terminal-svg-path' => image_path('illustrations/empty-state/empty-cloud-md.svg'),
105104
'web-terminal-help-path' => help_page_path('user/project/web_ide/index.md', anchor: 'interactive-web-terminals-for-the-web-ide'),
106105
'web-terminal-config-help-path' => help_page_path('user/project/web_ide/index.md', anchor: 'web-ide-configuration-file'),
107106
'web-terminal-runners-help-path' => help_page_path('user/project/web_ide/index.md', anchor: 'runner-configuration')

0 commit comments

Comments
 (0)