Skip to content

Commit f9d3505

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

File tree

8 files changed

+98
-80
lines changed

8 files changed

+98
-80
lines changed

‎app/assets/javascripts/ci/pipeline_details/header/components/header_actions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export default {
6464

6565
<template>
6666
<div>
67-
<div class="gl-mt-5 gl-flex gl-items-start gl-gap-3 lg:gl-mt-0">
67+
<div class="gl-flex gl-items-start gl-gap-3">
6868
<gl-button
6969
v-if="canRetryPipeline"
7070
v-gl-tooltip

‎app/assets/javascripts/ci/pipeline_details/header/pipeline_header.vue

Lines changed: 74 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
55
import { setUrlFragment, visitUrl } from '~/lib/utils/url_utility';
66
import { __, n__, sprintf, formatNumber } from '~/locale';
77
import { getIdFromGraphQLId, convertToGraphQLId } from '~/graphql_shared/utils';
8+
import PageHeading from '~/vue_shared/components/page_heading.vue';
89
import { TYPENAME_CI_PIPELINE } from '~/graphql_shared/constants';
910
import { reportToSentry } from '~/ci/utils';
1011
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
@@ -39,6 +40,7 @@ export default {
3940
GlLink,
4041
GlLoadingIcon,
4142
GlSprintf,
43+
PageHeading,
4244
HeaderActions,
4345
HeaderBadges,
4446
TimeAgoTooltip,
@@ -348,7 +350,7 @@ export default {
348350
</script>
349351
350352
<template>
351-
<div class="gl-my-4" data-testid="pipeline-header">
353+
<div data-testid="pipeline-header">
352354
<gl-alert
353355
v-if="hasError"
354356
class="gl-mb-4"
@@ -362,68 +364,70 @@ export default {
362364
</div>
363365
</gl-alert>
364366
365-
<gl-loading-icon v-if="loading" class="gl-text-left" size="lg" />
367+
<gl-loading-icon v-if="loading" class="gl-mt-5 gl-text-center" size="md" />
366368
367-
<div v-else class="gl-flex gl-flex-wrap gl-justify-between">
368-
<div>
369-
<h3 v-if="pipelineName" class="gl-mb-3 gl-mt-0" data-testid="pipeline-name">
369+
<page-heading v-else inline-actions class="gl-mb-0 gl-gap-y-5 sm:gl-gap-y-3">
370+
<template #heading>
371+
<span v-if="pipelineName" data-testid="pipeline-name">
370372
{{ pipelineName }}
371-
</h3>
372-
<h3 v-else class="gl-mb-3 gl-mt-0" data-testid="pipeline-commit-title">
373+
</span>
374+
<span v-else data-testid="pipeline-commit-title">
373375
{{ commitTitle }}
374-
</h3>
375-
<div>
376-
<ci-icon :status="detailedStatus" show-status-text class="gl-mb-3" />
377-
<div class="gl-mb-3 gl-ml-2 gl-inline-block gl-h-6">
378-
<gl-link
379-
v-if="user"
380-
:href="user.webUrl"
381-
class="js-user-link gl-inline-block gl-font-bold gl-text-default"
382-
:data-user-id="userId"
383-
:data-username="user.username"
384-
data-testid="pipeline-user-link"
385-
>
386-
{{ user.name }}
387-
</gl-link>
388-
<gl-sprintf :message="triggeredText">
389-
<template #link="{ content }">
390-
<gl-link
391-
:href="commitPath"
392-
class="commit-sha-container"
393-
data-testid="commit-link"
394-
target="_blank"
395-
>
396-
{{ content }}
397-
</gl-link>
398-
</template>
399-
</gl-sprintf>
400-
</div>
401-
<div class="gl-mb-3 gl-inline-block">
402-
<clipboard-button
403-
:text="commitSha"
404-
category="tertiary"
405-
:title="__('Copy commit SHA')"
406-
data-testid="commit-copy-sha"
407-
size="small"
408-
/>
376+
</span>
377+
</template>
378+
379+
<template #description>
380+
<ci-icon :status="detailedStatus" show-status-text class="gl-mb-3" />
381+
<div class="gl-inline-block">
382+
<gl-link
383+
v-if="user"
384+
:href="user.webUrl"
385+
class="js-user-link gl-inline-block gl-font-bold gl-text-default"
386+
:data-user-id="userId"
387+
:data-username="user.username"
388+
data-testid="pipeline-user-link"
389+
>
390+
{{ user.name }}
391+
</gl-link>
392+
<gl-sprintf :message="triggeredText">
393+
<template #link="{ content }">
394+
<gl-link
395+
:href="commitPath"
396+
class="commit-sha-container"
397+
data-testid="commit-link"
398+
target="_blank"
399+
>
400+
{{ content }}
401+
</gl-link>
402+
</template>
403+
</gl-sprintf>
404+
<clipboard-button
405+
:text="commitSha"
406+
category="tertiary"
407+
:title="__('Copy commit SHA')"
408+
data-testid="commit-copy-sha"
409+
size="small"
410+
/>
411+
</div>
412+
<div class="gl-inline-block">
413+
<time-ago-tooltip
414+
v-if="inProgress"
415+
:time="pipeline.createdAt"
416+
data-testid="pipeline-created-time-ago"
417+
/>
418+
<template v-if="isFinished">
409419
<time-ago-tooltip
410-
v-if="inProgress"
411420
:time="pipeline.createdAt"
412-
data-testid="pipeline-created-time-ago"
421+
data-testid="pipeline-finished-created-time-ago"
422+
/>, {{ s__('Pipelines|finished') }}
423+
<time-ago-tooltip
424+
:time="pipeline.finishedAt"
425+
data-testid="pipeline-finished-time-ago"
413426
/>
414-
<template v-if="isFinished">
415-
<time-ago-tooltip
416-
:time="pipeline.createdAt"
417-
data-testid="pipeline-finished-created-time-ago"
418-
/>, {{ s__('Pipelines|finished') }}
419-
<time-ago-tooltip
420-
:time="pipeline.finishedAt"
421-
data-testid="pipeline-finished-time-ago"
422-
/>
423-
</template>
424-
</div>
427+
</template>
425428
</div>
426-
<div v-safe-html="refText" class="gl-mb-3" data-testid="pipeline-ref-text"></div>
429+
430+
<div v-safe-html="refText" class="gl-my-3 sm:gl-mt-0" data-testid="pipeline-ref-text"></div>
427431
<div>
428432
<header-badges :pipeline="pipeline" />
429433
@@ -461,18 +465,21 @@ export default {
461465
<div v-if="isMergeTrainPipeline" class="gl-mt-2">
462466
<header-merge-trains-link />
463467
</div>
464-
</div>
468+
</template>
465469
466-
<header-actions
467-
:pipeline="pipeline"
468-
:is-retrying="isRetrying"
469-
:is-canceling="isCanceling"
470-
:is-deleting="isDeleting"
471-
@retryPipeline="retryPipeline($event)"
472-
@cancelPipeline="cancelPipeline($event)"
473-
@deletePipeline="deletePipeline($event)"
474-
/>
475-
</div>
470+
<template #actions>
471+
<header-actions
472+
class="gl-self-start"
473+
:pipeline="pipeline"
474+
:is-retrying="isRetrying"
475+
:is-canceling="isCanceling"
476+
:is-deleting="isDeleting"
477+
@retryPipeline="retryPipeline($event)"
478+
@cancelPipeline="cancelPipeline($event)"
479+
@deletePipeline="deletePipeline($event)"
480+
/>
481+
</template>
482+
</page-heading>
476483
477484
<pipeline-account-verification-alert class="gl-mt-4" />
478485
</div>

‎doc/ci/migration/examples/jenkins-maven.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ using the [shell executor](https://docs.gitlab.com/runner/executors/shell.html).
4141
If using Jenkins' built-in shell execution option to directly call `mvn` commands
4242
from the shell on the agent, the configuration might look like:
4343

44-
![freestyle shell](img/maven-freestyle-shell_v16_4.png)
44+
![Jenkins UI that shows build steps with Maven commands defined as shell commands.](img/maven-freestyle-shell_v16_4.png)
4545

4646
### Freestyle with Maven task plugin
4747

4848
If using the Maven plugin in Jenkins to declare and execute any specific goals
4949
in the [Maven build lifecycle](https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html),
5050
the configuration might look like:
5151

52-
![freestyle plugin](img/maven-freestyle-plugin_v16_4.png)
52+
![Jenkins UI that shows build steps with Maven commands defined using the Maven plugin.](img/maven-freestyle-plugin_v16_4.png)
5353

5454
This plugin requires Maven to be installed on the Jenkins agent, and uses a script wrapper
5555
for calling Maven commands.

‎doc/development/documentation/site_architecture/global_nav.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,12 @@ For example:
162162
Each entry can stand alone or contain nested pages, under `submenu`.
163163
New components are indented two spaces.
164164

165-
All nav links are selectable and must refer to unique pages.
165+
All nav links:
166+
167+
- Are selectable.
168+
- Must refer to unique pages.
169+
- Must not point to an anchor in a page, for example: `path/to/page/#anchor-link`.
170+
166171
This must be followed so that we don't have duplicated links nor two `.active` links
167172
at the same time.
168173

‎doc/editor_extensions/eclipse/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ title: GitLab for Eclipse
88

99
{{< details >}}
1010

11-
- Tier: Free, Premium, Ultimate
11+
- Tier: Premium, Ultimate
1212
- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated
13-
- Status: Experiment
13+
- Status: Beta
1414

1515
{{< /details >}}
1616

‎doc/editor_extensions/eclipse/setup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ title: Install and set up GitLab for Eclipse
88

99
{{< details >}}
1010

11-
- Tier: Free, Premium, Ultimate
11+
- Tier: Premium, Ultimate
1212
- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated
13-
- Status: Experiment
13+
- Status: Beta
1414

1515
{{< /details >}}
1616

‎doc/editor_extensions/eclipse/troubleshooting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ title: Eclipse troubleshooting
88

99
{{< details >}}
1010

11-
- Tier: Free, Premium, Ultimate
11+
- Tier: Premium, Ultimate
1212
- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated
13-
- Status: Experiment
13+
- Status: Beta
1414

1515
{{< /details >}}
1616

‎doc/user/duo_amazon_q/setup.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,15 @@ Start by creating an IAM identity provider.
6262

6363
First, you need the some values from GitLab:
6464

65+
Prerequisites:
66+
67+
- You must be an administrator.
68+
6569
1. Sign in to GitLab.
6670
1. On the left sidebar, at the bottom, select **Admin**.
6771
1. Select **Settings > General**.
68-
1. Expand **Configure GitLab Duo with Amazon Q**.
72+
1. Expand **GitLab Duo with Amazon Q**.
73+
1. Select **View configuration setup**.
6974
1. Under step 1, copy the provider URL and audience. You will need them in the next step.
7075

7176
Now, create an AWS identity provider:
@@ -239,7 +244,7 @@ Prerequisites:
239244
1. Sign in to GitLab.
240245
1. On the left sidebar, at the bottom, select **Admin**.
241246
1. Select **Settings > General**.
242-
1. Expand **Configure GitLab Duo with Amazon Q**.
247+
1. Expand **GitLab Duo with Amazon Q**.
243248
1. Select **View configuration setup**.
244249
1. Under **IAM role's ARN**, paste the ARN.
245250
1. To determine which groups and projects can use GitLab Duo with Amazon Q, choose an option:
@@ -282,9 +287,10 @@ Prerequisites:
282287

283288
To turn off GitLab Duo with Amazon Q for the instance:
284289

290+
1. Sign in to GitLab.
285291
1. On the left sidebar, at the bottom, select **Admin**.
286292
1. Select **Settings > General**.
287-
1. Expand **Amazon Q**.
293+
1. Expand **GitLab Duo with Amazon Q**.
288294
1. Select **View configuration setup**.
289295
1. Select **Always off**.
290296
1. Select **Save changes**.

0 commit comments

Comments
 (0)