Skip to content

Commit 9d485c1

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 35ee286 commit 9d485c1

File tree

13 files changed

+49
-49
lines changed

13 files changed

+49
-49
lines changed

.gitlab/issue_templates/Feature Flag Roll Out.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ To do so, follow these steps:
109109
If the merge request was deployed before [the code cutoff](https://about.gitlab.com/handbook/engineering/releases/#self-managed-releases-1),
110110
the feature can be officially announced in a release blog post.
111111
- [ ] `/chatops run auto_deploy status <merge-commit>`
112-
- [ ] Close [the feature issue](ISSUE LINK) to indicate the feature has been released.
112+
- [ ] Close [the feature issue](ISSUE LINK) to indicate the feature will be released in the current milestone.
113113

114114
**WARNING:** This approach has the downside that it makes it difficult for us to
115115
[clean up](https://docs.gitlab.com/ee/development/feature_flags/controls.html#cleaning-up) the flag.
@@ -134,7 +134,7 @@ codebase.
134134
If the merge request was deployed before [the code cutoff](https://about.gitlab.com/handbook/engineering/releases/#self-managed-releases-1),
135135
the feature can be officially announced in a release blog post.
136136
- [ ] `/chatops run auto_deploy status <merge-commit>`
137-
- [ ] Close [the feature issue](ISSUE LINK) to indicate the feature has been released.
137+
- [ ] Close [the feature issue](ISSUE LINK) to indicate the feature will be released in the current milestone.
138138
- [ ] Clean up the feature flag from all environments by running these chatops command in `#production` channel:
139139
- [ ] `/chatops run feature delete <feature-flag-name> --dev`
140140
- [ ] `/chatops run feature delete <feature-flag-name> --staging`

app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ export default {
146146
<span v-if="dueDate" class="order-md-1">
147147
<issue-due-date
148148
:date="dueDate"
149+
:closed="Boolean(closedAt)"
149150
tooltip-placement="top"
150151
css-class="item-due-date gl-display-flex gl-align-items-center"
151152
/>

app/controllers/projects/pipelines_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def serialize_pipelines
223223
PipelineSerializer
224224
.new(project: @project, current_user: @current_user)
225225
.with_pagination(request, response)
226-
.represent(@pipelines, disable_coverage: true, preload: true, disable_artifacts: true)
226+
.represent(@pipelines, disable_coverage: true, preload: true)
227227
end
228228

229229
def render_show

app/serializers/pipeline_details_entity.rb

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ class PipelineDetailsEntity < Ci::PipelineEntity
88
end
99

1010
expose :details do
11-
expose :artifacts, unless: proc { options[:disable_artifacts] } do |pipeline, options|
12-
rel = pipeline.downloadable_artifacts
13-
14-
if Feature.enabled?(:non_public_artifacts, type: :development)
15-
rel = rel.select { |artifact| can?(request.current_user, :read_job_artifacts, artifact.job) }
16-
end
17-
18-
BuildArtifactEntity.represent(rel, options.merge(project: pipeline.project))
19-
end
2011
expose :manual_actions, using: BuildActionEntity
2112
expose :scheduled_actions, using: BuildActionEntity
2213
end

app/serializers/pipeline_serializer.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ def preloaded_relations
4949
{
5050
manual_actions: :metadata,
5151
scheduled_actions: :metadata,
52-
downloadable_artifacts: {
53-
project: [:route, { namespace: :route }],
54-
job: []
55-
},
5652
failed_builds: %i(project metadata),
5753
merge_request: {
5854
source_project: [:route, { namespace: :route }],
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
title: Don't show due dates in red if the issue is closed
2+
merge_request: 57647
3+
author: Daniel Ziegenberg <[email protected]>
4+
type: fixed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Stop exposing artifacts in pipelines.json
3+
merge_request: 61253
4+
author:
5+
type: performance

doc/user/project/issue_board.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,10 @@ As in other list types, click the trash icon to remove a list.
343343
### Iteration lists **(PREMIUM)**
344344

345345
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/250479) in GitLab 13.11.
346-
> - [Deployed behind the `board_new_lists` and `iteration_board_lists` feature flags](../feature_flags.md), enabled by default.
346+
> - [Deployed behind the `board_new_list` and `iteration_board_lists` feature flags](../feature_flags.md), enabled by default.
347347
> - Enabled on GitLab.com.
348348
> - Recommended for production use.
349-
> - For GitLab self-managed instances, GitLab administrators can opt to disable the feature flags: [`board_new_lists`](#enable-or-disable-new-add-list-form) and [`iteration_board_lists`](#enable-or-disable-iteration-lists-in-boards). **(PREMIUM SELF)**
349+
> - For GitLab self-managed instances, GitLab administrators can opt to disable the feature flags: [`board_new_list`](#enable-or-disable-new-add-list-form) and [`iteration_board_lists`](#enable-or-disable-iteration-lists-in-boards). **(PREMIUM SELF)**
350350
351351
There can be
352352
[risks when disabling released features](../feature_flags.md#risks-when-disabling-released-features).

spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,35 @@ describe('RelatedIssuableItem', () => {
132132
it('renders due date component with correct due date', () => {
133133
expect(wrapper.find(IssueDueDate).props('date')).toBe(props.dueDate);
134134
});
135+
136+
it('does not render red icon for overdue issue that is closed', async () => {
137+
mountComponent({
138+
props: {
139+
...props,
140+
closedAt: '2018-12-01T00:00:00.00Z',
141+
},
142+
});
143+
await wrapper.vm.$nextTick();
144+
145+
expect(wrapper.find(IssueDueDate).props('closed')).toBe(true);
146+
});
147+
148+
it('should not contain the `.text-danger` css class for overdue issue that is closed', async () => {
149+
mountComponent({
150+
props: {
151+
...props,
152+
closedAt: '2018-12-01T00:00:00.00Z',
153+
},
154+
});
155+
await wrapper.vm.$nextTick();
156+
157+
expect(wrapper.find(IssueDueDate).find('.board-card-info-icon').classes('text-danger')).toBe(
158+
false,
159+
);
160+
expect(wrapper.find(IssueDueDate).find('.board-card-info-text').classes('text-danger')).toBe(
161+
false,
162+
);
163+
});
135164
});
136165

137166
describe('token assignees', () => {

spec/serializers/merge_requests/pipeline_entity_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,4 @@
4242
expect(entity.as_json).not_to include(:coverage)
4343
end
4444
end
45-
46-
it_behaves_like 'public artifacts'
4745
end

0 commit comments

Comments
 (0)