Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
67770e6591
commit
30340141d5
49 changed files with 113 additions and 241 deletions
|
|
@ -25,7 +25,8 @@
|
|||
.decomposed-database-rspec:
|
||||
extends: .decomposed-database
|
||||
variables:
|
||||
GITLAB_LOAD_BALANCING_REUSE_PRIMARY_ci: "main"
|
||||
# For decomposition phase 3, uncomment line below:
|
||||
# GITLAB_LOAD_BALANCING_REUSE_PRIMARY_ci: "main"
|
||||
GITLAB_USE_MODEL_LOAD_BALANCING: "true"
|
||||
|
||||
.rspec-base:
|
||||
|
|
|
|||
|
|
@ -131,6 +131,13 @@ export const ITALIC_TEXT = {
|
|||
customizable: false,
|
||||
};
|
||||
|
||||
export const STRIKETHROUGH_TEXT = {
|
||||
id: 'editing.strikethroughText',
|
||||
description: __('Strikethrough text'),
|
||||
defaultKeys: ['mod+shift+x'],
|
||||
customizable: false,
|
||||
};
|
||||
|
||||
export const LINK_TEXT = {
|
||||
id: 'editing.linkText',
|
||||
description: __('Link text'),
|
||||
|
|
@ -511,7 +518,14 @@ export const GLOBAL_SHORTCUTS_GROUP = {
|
|||
export const EDITING_SHORTCUTS_GROUP = {
|
||||
id: 'editing',
|
||||
name: __('Editing'),
|
||||
keybindings: [BOLD_TEXT, ITALIC_TEXT, LINK_TEXT, TOGGLE_MARKDOWN_PREVIEW, EDIT_RECENT_COMMENT],
|
||||
keybindings: [
|
||||
BOLD_TEXT,
|
||||
ITALIC_TEXT,
|
||||
STRIKETHROUGH_TEXT,
|
||||
LINK_TEXT,
|
||||
TOGGLE_MARKDOWN_PREVIEW,
|
||||
EDIT_RECENT_COMMENT,
|
||||
],
|
||||
};
|
||||
|
||||
export const WIKI_SHORTCUTS_GROUP = {
|
||||
|
|
|
|||
|
|
@ -574,6 +574,10 @@ class GfmAutoComplete {
|
|||
// Do not match if there is no `~` before the cursor
|
||||
return null;
|
||||
}
|
||||
if (subtext.endsWith('~~')) {
|
||||
// Do not match if there are two consecutive `~` characters (strikethrough) before the cursor
|
||||
return null;
|
||||
}
|
||||
const lastCandidate = subtext.split(flag).pop();
|
||||
if (labels.find((label) => label.title.startsWith(lastCandidate))) {
|
||||
return lastCandidate;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,13 @@
|
|||
<script>
|
||||
import { GlPopover, GlButton, GlTooltipDirective, GlTabs, GlTab } from '@gitlab/ui';
|
||||
import $ from 'jquery';
|
||||
import { keysFor, BOLD_TEXT, ITALIC_TEXT, LINK_TEXT } from '~/behaviors/shortcuts/keybindings';
|
||||
import {
|
||||
keysFor,
|
||||
BOLD_TEXT,
|
||||
ITALIC_TEXT,
|
||||
STRIKETHROUGH_TEXT,
|
||||
LINK_TEXT,
|
||||
} from '~/behaviors/shortcuts/keybindings';
|
||||
import { getSelectedFragment } from '~/lib/utils/common_utils';
|
||||
import { s__, __ } from '~/locale';
|
||||
import { CopyAsGFM } from '../../../behaviors/markdown/copy_as_gfm';
|
||||
|
|
@ -149,6 +155,7 @@ export default {
|
|||
shortcuts: {
|
||||
bold: keysFor(BOLD_TEXT),
|
||||
italic: keysFor(ITALIC_TEXT),
|
||||
strikethrough: keysFor(STRIKETHROUGH_TEXT),
|
||||
link: keysFor(LINK_TEXT),
|
||||
},
|
||||
i18n: {
|
||||
|
|
@ -199,6 +206,16 @@ export default {
|
|||
:shortcuts="$options.shortcuts.italic"
|
||||
icon="italic"
|
||||
/>
|
||||
<toolbar-button
|
||||
tag="~~"
|
||||
:button-title="
|
||||
sprintf(s__('MarkdownEditor|Add strikethrough text (%{modifierKey}⇧X)'), {
|
||||
modifierKey,
|
||||
})
|
||||
"
|
||||
:shortcuts="$options.shortcuts.strikethrough"
|
||||
icon="strikethrough"
|
||||
/>
|
||||
<toolbar-button
|
||||
:prepend="true"
|
||||
:tag="tag"
|
||||
|
|
|
|||
|
|
@ -1166,7 +1166,7 @@ module Ci
|
|||
|
||||
def merge_request?
|
||||
if Feature.enabled?(:ci_pipeline_merge_request_presence_check, default_enabled: :yaml)
|
||||
merge_request_id.present? && merge_request
|
||||
merge_request_id.present? && merge_request.present?
|
||||
else
|
||||
merge_request_id.present?
|
||||
end
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@
|
|||
data: { "md-tag" => "_", "md-shortcuts": '["mod+i"]' },
|
||||
title: sprintf(s_("MarkdownEditor|Add italic text (%{modifier_key}I)") % { modifier_key: modifier_key }) })
|
||||
|
||||
= markdown_toolbar_button({ icon: "strikethrough",
|
||||
data: { "md-tag" => "~~", "md-shortcuts": '["mod+shift+x"]' },
|
||||
title: sprintf(s_("MarkdownEditor|Add strikethrough text (%{modifier_key}⇧X)") % { modifier_key: modifier_key }) })
|
||||
|
||||
= markdown_toolbar_button({ icon: "quote", data: { "md-tag" => "> ", "md-prepend" => true }, title: _("Insert a quote") })
|
||||
= markdown_toolbar_button({ icon: "code", data: { "md-tag" => "`", "md-block" => "```" }, title: _("Insert code") })
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'postgresql/database_load_balancing.md'
|
||||
remove_date: '2022-02-19'
|
||||
---
|
||||
|
||||
This file was moved to [another location](postgresql/database_load_balancing.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-19>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -23,7 +23,7 @@ to clone and fetch large repositories, speeding up development.
|
|||
|
||||
For a video introduction to Geo, see [Introduction to GitLab Geo - GitLab Features](https://www.youtube.com/watch?v=-HDLxSjEh6w).
|
||||
|
||||
To make sure you're using the right version of the documentation, navigate to [the Geo page on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/administration/geo/index.md) and choose the appropriate release from the **Switch branch/tag** dropdown. For example, [`v13.7.6-ee`](https://gitlab.com/gitlab-org/gitlab/-/blob/v13.7.6-ee/doc/administration/geo/index.md).
|
||||
To make sure you're using the right version of the documentation, go to [the Geo page on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/administration/geo/index.md) and choose the appropriate release from the **Switch branch/tag** dropdown list. For example, [`v13.7.6-ee`](https://gitlab.com/gitlab-org/gitlab/-/blob/v13.7.6-ee/doc/administration/geo/index.md).
|
||||
|
||||
Geo uses a set of defined terms that are described in the [Geo Glossary](glossary.md).
|
||||
Be sure to familiarize yourself with those terms.
|
||||
|
|
@ -148,14 +148,14 @@ NOTE:
|
|||
When using HTTP or HTTPS proxying, your load balancer must be configured to pass through the `Connection` and `Upgrade` hop-by-hop headers. See the [web terminal](../integration/terminal.md) integration guide for more details.
|
||||
|
||||
NOTE:
|
||||
When using HTTPS protocol for port 443, you need to add an SSL certificate to the load balancers.
|
||||
When using HTTPS protocol for port 443, you must add an SSL certificate to the load balancers.
|
||||
If you wish to terminate SSL at the GitLab application server instead, use TCP protocol.
|
||||
|
||||
#### Internal URL
|
||||
|
||||
HTTP requests from any Geo secondary site to the primary Geo site use the Internal URL of the primary
|
||||
Geo site. If this is not explicitly defined in the primary Geo site settings in the Admin Area, the
|
||||
public URL of the primary site will be used.
|
||||
public URL of the primary site is used.
|
||||
|
||||
To update the internal URL of the primary Geo site:
|
||||
|
||||
|
|
@ -187,7 +187,7 @@ Because the replicated database instance is read-only, we need this additional d
|
|||
This daemon:
|
||||
|
||||
- Reads a log of events replicated by the **primary** site to the **secondary** database instance.
|
||||
- Updates the Geo Tracking Database instance with changes that need to be executed.
|
||||
- Updates the Geo Tracking Database instance with changes that must be executed.
|
||||
|
||||
When something is marked to be updated in the tracking database instance, asynchronous jobs running on the **secondary** site execute the required operations and update the state.
|
||||
|
||||
|
|
@ -198,7 +198,7 @@ This new architecture allows GitLab to be resilient to connectivity issues betwe
|
|||
WARNING:
|
||||
This list of limitations only reflects the latest version of GitLab. If you are using an older version, extra limitations may be in place.
|
||||
|
||||
- Pushing directly to a **secondary** site redirects (for HTTP) or proxies (for SSH) the request to the **primary** site instead of [handling it directly](https://gitlab.com/gitlab-org/gitlab/-/issues/1381), except when using Git over HTTP with credentials embedded within the URI. For example, `https://user:password@secondary.tld`.
|
||||
- Pushing directly to a **secondary** site redirects (for HTTP) or proxies (for SSH) the request to the **primary** site instead of [handling it directly](https://gitlab.com/gitlab-org/gitlab/-/issues/1381), except when using Git over HTTP with credentials embedded in the URI. For example, `https://user:password@secondary.tld`.
|
||||
- The **primary** site has to be online for OAuth login to happen. Existing sessions and Git are not affected. Support for the **secondary** site to use an OAuth provider independent from the primary is [being planned](https://gitlab.com/gitlab-org/gitlab/-/issues/208465).
|
||||
- The installation takes multiple manual steps that together can take about an hour depending on circumstances. We are working on improving this experience. See [Omnibus GitLab issue #2978](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/2978) for details.
|
||||
- Real-time updates of issues/merge requests (for example, via long polling) doesn't work on the **secondary** site.
|
||||
|
|
@ -216,7 +216,7 @@ For setup instructions, see [Setting up Geo](setup/index.md).
|
|||
|
||||
## Post-installation documentation
|
||||
|
||||
After installing GitLab on the **secondary** site(s) and performing the initial configuration, see the following documentation for post-installation information.
|
||||
After installing GitLab on the **secondary** sites and performing the initial configuration, see the following documentation for post-installation information.
|
||||
|
||||
### Configuring Geo
|
||||
|
||||
|
|
@ -224,7 +224,7 @@ For information on configuring Geo, see [Geo configuration](replication/configur
|
|||
|
||||
### Updating Geo
|
||||
|
||||
For information on how to update your Geo site(s) to the latest GitLab version, see [Updating the Geo sites](replication/updating_the_geo_sites.md).
|
||||
For information on how to update your Geo sites to the latest GitLab version, see [Updating the Geo sites](replication/updating_the_geo_sites.md).
|
||||
|
||||
### Pausing and resuming replication
|
||||
|
||||
|
|
@ -237,8 +237,8 @@ secondary. If the site is paused, be sure to resume before promoting. This
|
|||
issue has been fixed in GitLab 13.4 and later.
|
||||
|
||||
WARNING:
|
||||
Pausing and resuming of replication is currently only supported for Geo installations using an
|
||||
Omnibus GitLab-managed database. External databases are currently not supported.
|
||||
Pausing and resuming of replication is only supported for Geo installations using an
|
||||
Omnibus GitLab-managed database. External databases are not supported.
|
||||
|
||||
In some circumstances, like during [upgrades](replication/updating_the_geo_sites.md) or a [planned failover](disaster_recovery/planned_failover.md), it is desirable to pause replication between the primary and secondary.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../../geo/replication/usage.md'
|
||||
remove_date: '2022-02-01'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../../geo/replication/usage.md).
|
||||
|
||||
<!-- This redirect file can be deleted after 2022-02-01 -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -301,7 +301,7 @@ Prometheus has several custom flags to configure local storage:
|
|||
|
||||
- `storage.tsdb.retention.time`: when to remove old data. Defaults to `15d`. Overrides
|
||||
`storage.tsdb.retention` if this flag is set to anything other than the default.
|
||||
- `storage.tsdb.retention.size`: [EXPERIMENTAL] the maximum number of bytes of storage blocks to
|
||||
- `storage.tsdb.retention.size`: (experimental) the maximum number of bytes of storage blocks to
|
||||
retain. The oldest data is removed first. Defaults to `0` (disabled). This flag is experimental
|
||||
and may change in future releases. Units supported: `B`, `KB`, `MB`, `GB`, `TB`, `PB`, `EB`. For
|
||||
example, `512MB`.
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'supported_os.md'
|
||||
remove_date: '2022-02-18'
|
||||
---
|
||||
|
||||
This document was moved to [another location](supported_os.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-18>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../saas/linux_saas_runner.md'
|
||||
remove_date: '2022-02-05'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../saas/linux_saas_runner.md).
|
||||
|
||||
<!-- This redirect file can be deleted after 2022-02-05. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../../saas/macos/environment.md'
|
||||
remove_date: '2022-02-05'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../../saas/macos/environment.md).
|
||||
|
||||
<!-- This redirect file can be deleted after 2022-02-05. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../saas/macos_saas_runner.md'
|
||||
remove_date: '2022-02-05'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../saas/macos_saas_runner.md).
|
||||
|
||||
<!-- This redirect file can be deleted after 2022-02-05. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../saas/windows_saas_runner.md'
|
||||
remove_date: '2022-02-05'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../saas/windows_saas_runner.md).
|
||||
|
||||
<!-- This redirect file can be deleted after 2022-02-05. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -13,9 +13,9 @@ If you are using self-managed GitLab or you use GitLab.com but want to use your
|
|||
If you are using GitLab SaaS (GitLab.com), your CI jobs automatically run on runners provided by GitLab.
|
||||
No configuration is required. Your jobs can run on:
|
||||
|
||||
- [Linux runners](build_cloud/linux_build_cloud.md).
|
||||
- [Windows runners](build_cloud/windows_build_cloud.md) (beta).
|
||||
- [macOS runners](build_cloud/macos_build_cloud.md) (beta).
|
||||
- [Linux runners](saas/linux_saas_runner.md).
|
||||
- [Windows runners](saas/windows_saas_runner.md) (beta).
|
||||
- [macOS runners](saas/macos_saas_runner.md) (beta).
|
||||
|
||||
The number of minutes you can use on these runners depends on the
|
||||
[maximum number of CI/CD minutes](../pipelines/cicd_minutes.md)
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../saas/linux_saas_runner.md'
|
||||
remove_date: '2022-02-05'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../saas/linux_saas_runner.md).
|
||||
|
||||
<!-- This redirect file can be deleted after 2022-02-05. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../../saas/macos/environment.md'
|
||||
remove_date: '2022-02-05'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../../saas/macos/environment.md).
|
||||
|
||||
<!-- This redirect file can be deleted after 2022-02-05. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../saas/macos_saas_runner.md'
|
||||
remove_date: '2022-02-05'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../saas/macos_saas_runner.md).
|
||||
|
||||
<!-- This redirect file can be deleted after 2022-02-05. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../saas/windows_saas_runner.md'
|
||||
remove_date: '2022-02-05'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../saas/windows_saas_runner.md).
|
||||
|
||||
<!-- This redirect file can be deleted after 2022-02-05. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/gitops.md'
|
||||
remove_date: '2022-02-01'
|
||||
---
|
||||
|
||||
This file was moved to [another location](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/gitops.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-01>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/identity_and_auth.md'
|
||||
remove_date: '2022-02-01'
|
||||
---
|
||||
|
||||
This file was moved to [another location](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/identity_and_auth.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-01>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/architecture.md'
|
||||
remove_date: '2022-02-01'
|
||||
---
|
||||
|
||||
This file was moved to [another location](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/architecture.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-01>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/local.md'
|
||||
remove_date: '2022-02-01'
|
||||
---
|
||||
|
||||
This file was moved to [another location](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/local.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-01>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/repository_overview.md'
|
||||
remove_date: '2022-02-01'
|
||||
---
|
||||
|
||||
This file was moved to [another location](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/repository_overview.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-01>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/kas_request_routing.md'
|
||||
remove_date: '2022-02-01'
|
||||
---
|
||||
|
||||
This file was moved to [another location](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/kas_request_routing.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-01>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/user_stories.md'
|
||||
remove_date: '2022-02-01'
|
||||
---
|
||||
|
||||
This file was moved to [another location](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/user_stories.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-01>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -201,10 +201,6 @@ CI/CD is always uppercase. No need to spell it out on first use.
|
|||
Use **CI/CD minutes** instead of **CI minutes**, **pipeline minutes**, **pipeline minutes quota**, or
|
||||
**CI pipeline minutes**. This decision was made in [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/342813).
|
||||
|
||||
## CI/CD tunnel
|
||||
|
||||
Use lowercase for **tunnel** in **CI/CD tunnel**.
|
||||
|
||||
## click
|
||||
|
||||
Do not use **click**. Instead, use **select** with buttons, links, menu items, and lists.
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'internal_api/index.md'
|
||||
remove_date: '2022-02-09'
|
||||
---
|
||||
|
||||
This document was moved to [another location](internal_api/index.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-09>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -303,7 +303,7 @@ The GitLab Runner server requirements depend on:
|
|||
|
||||
Since the nature of the jobs varies for each use case, you need to experiment by adjusting the job concurrency to get the optimum setting.
|
||||
|
||||
For reference, the [SaaS runners on Linux](../ci/runners/build_cloud/linux_build_cloud.md)
|
||||
For reference, the [SaaS runners on Linux](../ci/runners/saas/linux_saas_runner.md)
|
||||
are configured so that a **single job** runs in a **single instance** with:
|
||||
|
||||
- 1 vCPU.
|
||||
|
|
|
|||
|
|
@ -431,7 +431,7 @@ applications.
|
|||
| `HELM_UPGRADE_EXTRA_ARGS` | Allows extra options in `helm upgrade` commands when deploying the application. Note that using quotes doesn't prevent word splitting. |
|
||||
| `INCREMENTAL_ROLLOUT_MODE` | If present, can be used to enable an [incremental rollout](#incremental-rollout-to-production) of your application for the production environment. Set to `manual` for manual deployment jobs or `timed` for automatic rollout deployments with a 5 minute delay each one. |
|
||||
| `K8S_SECRET_*` | Any variable prefixed with [`K8S_SECRET_`](#application-secret-variables) is made available by Auto DevOps as environment variables to the deployed application. |
|
||||
| `KUBE_CONTEXT` | From GitLab 14.5, can be used to select which context to use from `KUBECONFIG`. When `KUBE_CONTEXT` is blank, the default context in `KUBECONFIG` (if any) will be used. A context must be selected when using the [CI/CD tunnel](../../user/clusters/agent/ci_cd_tunnel.md). |
|
||||
| `KUBE_CONTEXT` | From GitLab 14.5, can be used to select a context to use from `KUBECONFIG`. When `KUBE_CONTEXT` is blank, the default context in `KUBECONFIG` (if any) is used. A context must be selected when used [with the agent for Kubernetes](../../user/clusters/agent/ci_cd_tunnel.md). |
|
||||
| `KUBE_INGRESS_BASE_DOMAIN` | Can be used to set a domain per cluster. See [cluster domains](../../user/project/clusters/gitlab_managed_clusters.md#base-domain) for more information. |
|
||||
| `KUBE_NAMESPACE` | The namespace used for deployments. When using certificate-based clusters, [this value should not be overwritten directly](../../user/project/clusters/deploy_to_cluster.md#custom-namespace). |
|
||||
| `KUBECONFIG` | The kubeconfig to use for deployments. User-provided values take priority over GitLab-provided values. |
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: '../index.md'
|
||||
remove_date: '2022-02-03'
|
||||
---
|
||||
|
||||
This document was moved to [another location](../index.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-03>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -30,14 +30,14 @@ to Kubernetes clusters using the [GitLab agent](../user/clusters/agent/install/i
|
|||
|
||||
#### GitOps deployments **(PREMIUM)**
|
||||
|
||||
With the [GitLab agent](../user/clusters/agent/install/index.md), you can perform [pull-based
|
||||
With the [GitLab agent for Kubernetes](../user/clusters/agent/install/index.md), you can perform [pull-based
|
||||
deployments of Kubernetes manifests](../user/clusters/agent/gitops.md). This provides a scalable, secure, and cloud-native
|
||||
approach to manage Kubernetes deployments.
|
||||
|
||||
#### Deploy to Kubernetes with the CI/CD Tunnel
|
||||
#### Deploy to Kubernetes from GitLab CI/CD
|
||||
|
||||
With the [GitLab agent](../user/clusters/agent/install/index.md), you can perform push-based
|
||||
deployments with the [CI/CD Tunnel](../user/clusters/agent/ci_cd_tunnel.md). It provides
|
||||
With the [GitLab agent for Kubernetes](../user/clusters/agent/install/index.md), you can perform [push-based
|
||||
deployments](../user/clusters/agent/ci_cd_tunnel.md) from GitLab CI/CD. The agent provides
|
||||
a secure and reliable connection between GitLab and your Kubernetes cluster.
|
||||
|
||||
### Deploy to AWS with GitLab CI/CD
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'https://docs.gitlab.com/runner/install/kubernetes-agent.html'
|
||||
remove_date: '2022-02-01'
|
||||
---
|
||||
|
||||
This document was moved to [another location](https://docs.gitlab.com/runner/install/kubernetes-agent.html).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-02-01>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -25,7 +25,7 @@ For instance, you can:
|
|||
|
||||
The template contains the following [components](#configure-the-available-components):
|
||||
|
||||
- A pre-configured GitLab CI/CD file so that you can configure CI/CD pipelines using the [CI/CD Tunnel](agent/ci_cd_tunnel.md).
|
||||
- A pre-configured `.gitlab-ci.yml`file so that you can configure CI/CD pipelines using [the agent for Kubernetes](agent/ci_cd_tunnel.md).
|
||||
- A pre-configured [Helmfile](https://github.com/roboll/helmfile) so that
|
||||
you can manage cluster applications with [Helm v3](https://helm.sh/).
|
||||
- An `applications` directory with a `helmfile.yaml` configured for each
|
||||
|
|
@ -69,7 +69,7 @@ We assume that you already have a cluster connected through the agent and
|
|||
|
||||
1. [Create a new project from the Cluster Management Project Template](#create-a-new-project-based-on-the-cluster-management-template).
|
||||
This new project is "project B".
|
||||
1. In your "project A", [grant the agent access to the new project (B) through the CI/CD Tunnel](agent/ci_cd_tunnel.md#authorize-the-agent).
|
||||
1. In your "project A", [grant the agent access to the new project (B)](agent/ci_cd_tunnel.md#authorize-the-agent).
|
||||
1. From the "project's B" settings, add a [new environment variable](../../ci/variables/index.md#add-a-cicd-variable-to-a-project) `$KUBE_CONTEXT` and set it to `path/to/agent-configuration-project:your-agent-name`.
|
||||
1. In "project B", [configure the components](#configure-the-available-components) inherited from the template.
|
||||
|
||||
|
|
|
|||
|
|
@ -67,6 +67,5 @@ The concept of [project-level](../../project/clusters/index.md),
|
|||
[instance-level](../../instance/clusters/index.md) clusters becomes
|
||||
extinct in the new model, although the functionality remains to some extent.
|
||||
|
||||
The agent is always configured in a single GitLab project, but you can use the CI/CD Tunnel to
|
||||
authorize other projects and groups to use the same agent.
|
||||
The agent is always configured in a single GitLab project and you can expose the cluster connection to other projects and groups to [access it from GitLab CI/CD](../../clusters/agent/ci_cd_tunnel.md).
|
||||
By doing so, you are granting these projects and groups access to the same cluster, which is similar to group-level clusters' use case.
|
||||
|
|
|
|||
|
|
@ -592,17 +592,17 @@ plugins:
|
|||
If your merge requests do not show any code quality changes when using a custom tool,
|
||||
ensure that the line property is an `integer`.
|
||||
|
||||
### Code Quality CI job with Code Climate plugins enabled fails with error "engine <plugin_name> ran for 900 seconds and was killed"
|
||||
### Code Quality CI job with Code Climate plugins enabled fails with error
|
||||
|
||||
If you enabled any of the Code Climate plugins, and the Code Quality CI job fails with the error below,
|
||||
it's likely the job takes longer than the default timeout of 900 seconds.
|
||||
If you enabled any of the Code Climate plugins, and the Code Quality CI job fails with the error
|
||||
below, it's likely the job takes longer than the default timeout of 900 seconds:
|
||||
|
||||
```shell
|
||||
error: (CC::CLI::Analyze::EngineFailure) engine pmd ran for 900 seconds and was killed
|
||||
Could not analyze code quality for the repository at /code
|
||||
```
|
||||
|
||||
To work around this problem, set `TIMEOUT_SECONDS` to a higher value in your `.gitlab.-ci.yml` file.
|
||||
To work around this problem, set `TIMEOUT_SECONDS` to a higher value in your `.gitlab.-ci.yml` file.
|
||||
|
||||
For example:
|
||||
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ template that is included with GitLab.
|
|||
NOTE:
|
||||
For large scale k6 tests you need to ensure the GitLab Runner instance performing the actual
|
||||
test is able to handle running the test. Refer to [k6's guidance](https://k6.io/docs/testing-guides/running-large-tests#hardware-considerations)
|
||||
for spec details. The [default shared GitLab.com runners](../../../ci/runners/build_cloud/linux_build_cloud.md)
|
||||
for spec details. The [default shared GitLab.com runners](../../../ci/runners/saas/linux_saas_runner.md)
|
||||
likely have insufficient specs to handle most large k6 tests.
|
||||
|
||||
This template runs the
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
---
|
||||
redirect_to: 'conflicts.md'
|
||||
remove_date: '2022-01-26'
|
||||
---
|
||||
|
||||
This document was moved to [another location](conflicts.md).
|
||||
|
||||
<!-- This redirect file can be deleted after <2022-01-26>. -->
|
||||
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
|
||||
|
|
@ -51,6 +51,7 @@ descriptions):
|
|||
| <kbd>Command</kbd> + <kbd>Shift</kbd> + <kbd>p</kbd> | <kbd>Control</kbd> + <kbd>Shift</kbd> + <kbd>p</kbd> | Toggle Markdown preview when editing text in a text field that has **Write** and **Preview** tabs at the top. |
|
||||
| <kbd>Command</kbd> + <kbd>b</kbd> | <kbd>Control</kbd> + <kbd>b</kbd> | Bold the selected text (surround it with `**`). |
|
||||
| <kbd>Command</kbd> + <kbd>i</kbd> | <kbd>Control</kbd> + <kbd>i</kbd> | Italicize the selected text (surround it with `_`). |
|
||||
| <kbd>Command</kbd> + <kbd>Shift</kbd> + <kbd>s</kbd> | <kbd>Control</kbd> + <kbd>Shift</kbd> + <kbd>s</kbd> | Strike through the selected text (surround it with `~~`). |
|
||||
| <kbd>Command</kbd> + <kbd>k</kbd> | <kbd>Control</kbd> + <kbd>k</kbd> | Add a link (surround the selected text with `[]()`). |
|
||||
|
||||
The shortcuts for editing in text fields are always enabled, even if other
|
||||
|
|
|
|||
|
|
@ -22383,6 +22383,12 @@ msgstr ""
|
|||
msgid "MarkdownEditor|Add italic text (%{modifier_key}I)"
|
||||
msgstr ""
|
||||
|
||||
msgid "MarkdownEditor|Add strikethrough text (%{modifierKey}⇧X)"
|
||||
msgstr ""
|
||||
|
||||
msgid "MarkdownEditor|Add strikethrough text (%{modifier_key}⇧X)"
|
||||
msgstr ""
|
||||
|
||||
msgid "Marked For Deletion At - %{deletion_time}"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -35087,6 +35093,9 @@ msgstr ""
|
|||
msgid "Strikethrough"
|
||||
msgstr ""
|
||||
|
||||
msgid "Strikethrough text"
|
||||
msgstr ""
|
||||
|
||||
msgid "Subgroup information"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
module QA
|
||||
RSpec.describe 'Create' do
|
||||
describe 'Open a fork in Web IDE', quarantine: {
|
||||
only: { subdomain: %i[canary production] },
|
||||
issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/347247",
|
||||
issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/351696",
|
||||
type: :flaky
|
||||
} do
|
||||
let(:parent_project) do
|
||||
|
|
|
|||
|
|
@ -338,6 +338,8 @@ RSpec.describe 'Admin::Users' do
|
|||
end
|
||||
|
||||
it 'displays count of the users authorized groups' do
|
||||
visit admin_users_path
|
||||
|
||||
wait_for_requests
|
||||
|
||||
expect(page.find("[data-testid='user-group-count-#{current_user.id}']").text).to eq("2")
|
||||
|
|
|
|||
|
|
@ -111,6 +111,20 @@ RSpec.describe 'GFM autocomplete', :js do
|
|||
fill_in 'Comment', with: "test\n\n@"
|
||||
expect(find_autocomplete_menu).to be_visible
|
||||
end
|
||||
|
||||
it 'does not open label autocomplete menu after strikethrough', :aggregate_failures do
|
||||
fill_in 'Comment', with: "~~"
|
||||
expect(page).not_to have_css('.atwho-view')
|
||||
|
||||
fill_in 'Comment', with: "~~gone~~"
|
||||
expect(page).not_to have_css('.atwho-view')
|
||||
|
||||
fill_in 'Comment', with: "~"
|
||||
expect(find_autocomplete_menu).to be_visible
|
||||
|
||||
fill_in 'Comment', with: "test\n\n~"
|
||||
expect(find_autocomplete_menu).to be_visible
|
||||
end
|
||||
end
|
||||
|
||||
context 'xss checks' do
|
||||
|
|
|
|||
|
|
@ -37,6 +37,14 @@ RSpec.describe 'Markdown keyboard shortcuts', :js do
|
|||
expect(markdown_field.value).to eq('_italic_')
|
||||
end
|
||||
|
||||
it 'strikes text when <modifier>+<shift>+x is pressed' do
|
||||
type_and_select('strikethrough')
|
||||
|
||||
markdown_field.send_keys([modifier_key, :shift, 'x'])
|
||||
|
||||
expect(markdown_field.value).to eq('~~strikethrough~~')
|
||||
end
|
||||
|
||||
it 'links text when <modifier>+K is pressed' do
|
||||
type_and_select('link')
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ RSpec.describe 'Merge request > User sees diff', :js do
|
|||
end
|
||||
|
||||
context 'as user who needs to fork' do
|
||||
it 'shows fork/cancel confirmation', :sidekiq_might_not_need_inline do
|
||||
it 'shows fork/cancel confirmation', :sidekiq_might_not_need_inline, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/337477' do
|
||||
sign_in(user)
|
||||
visit diffs_project_merge_request_path(project, merge_request)
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ describe('Markdown field component', () => {
|
|||
const getPreviewLink = () => subject.findByTestId('preview-tab');
|
||||
const getWriteLink = () => subject.findByTestId('write-tab');
|
||||
const getMarkdownButton = () => subject.find('.js-md');
|
||||
const getAllMarkdownButtons = () => subject.findAll('.js-md');
|
||||
const getListBulletedButton = () => subject.findAll('.js-md[title="Add a bullet list"]');
|
||||
const getVideo = () => subject.find('video');
|
||||
const getAttachButton = () => subject.find('.button-attach-file');
|
||||
const clickAttachButton = () => getAttachButton().trigger('click');
|
||||
|
|
@ -185,7 +185,7 @@ describe('Markdown field component', () => {
|
|||
it('converts a line', async () => {
|
||||
const textarea = subject.find('textarea').element;
|
||||
textarea.setSelectionRange(0, 0);
|
||||
const markdownButton = getAllMarkdownButtons().wrappers[5];
|
||||
const markdownButton = getListBulletedButton();
|
||||
markdownButton.trigger('click');
|
||||
|
||||
await nextTick();
|
||||
|
|
@ -195,7 +195,7 @@ describe('Markdown field component', () => {
|
|||
it('converts multiple lines', async () => {
|
||||
const textarea = subject.find('textarea').element;
|
||||
textarea.setSelectionRange(0, 50);
|
||||
const markdownButton = getAllMarkdownButtons().wrappers[5];
|
||||
const markdownButton = getListBulletedButton();
|
||||
markdownButton.trigger('click');
|
||||
|
||||
await nextTick();
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ describe('Markdown field header component', () => {
|
|||
const buttons = [
|
||||
'Add bold text (⌘B)',
|
||||
'Add italic text (⌘I)',
|
||||
'Add strikethrough text (⌘⇧X)',
|
||||
'Insert a quote',
|
||||
'Insert suggestion',
|
||||
'Insert code',
|
||||
|
|
|
|||
|
|
@ -224,7 +224,8 @@ RSpec.describe Ci::PipelineEntity do
|
|||
end
|
||||
|
||||
it 'makes atached flag true' do
|
||||
expect(subject[:flags][:merge_request_pipeline]).to be_truthy
|
||||
expect(subject[:flags][:merge_request_pipeline]).to be true
|
||||
expect(subject[:flags][:merge_request]).to be true
|
||||
end
|
||||
|
||||
it 'exposes source sha and target sha' do
|
||||
|
|
|
|||
Loading…
Reference in a new issue