Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-08-04 12:09:21 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-08-04 12:09:21 +0300
commitf797f00ec769812339968010af178b3d51a4c460 (patch)
tree42cc95e6ea18111fcc537ba2cea2e9f027e9ad27 /doc
parentdebd8f45f8613aa1ac63362c86a7d8137df173a4 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/secure_files.md25
-rw-r--r--doc/ci/pipelines/merge_request_pipelines.md7
-rw-r--r--doc/integration/jira/connect-app.md23
-rw-r--r--doc/integration/jira/development_panel.md4
-rw-r--r--doc/integration/oauth_provider.md1
-rw-r--r--doc/tutorials/build_application.md1
-rw-r--r--doc/user/profile/comment_templates.md1
-rw-r--r--doc/user/profile/index.md1
-rw-r--r--doc/user/profile/personal_access_tokens.md1
-rw-r--r--doc/user/project/repository/gpg_signed_commits/index.md1
-rw-r--r--doc/user/ssh.md1
11 files changed, 36 insertions, 30 deletions
diff --git a/doc/administration/secure_files.md b/doc/administration/secure_files.md
index 3c9d40c3e73..a14033bdf00 100644
--- a/doc/administration/secure_files.md
+++ b/doc/administration/secure_files.md
@@ -42,11 +42,7 @@ Prerequisite:
gitlab_rails['ci_secure_files_enabled'] = false
```
-1. Save the file and reconfigure GitLab:
-
- ```shell
- sudo gitlab-ctl reconfigure
- ```
+1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation).
**For self-compiled installations**
@@ -73,12 +69,7 @@ are stored locally, follow the steps below.
gitlab_rails['ci_secure_files_storage_path'] = "/mnt/storage/ci_secure_files"
```
-1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation)
-1. Save the file and reconfigure GitLab:
-
- ```shell
- sudo gitlab-ctl reconfigure
- ```
+1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation).
**For self-compiled installations**
@@ -149,14 +140,8 @@ See [the available connection settings for different providers](object_storage.m
}
```
-1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation)
-1. Save the file and reconfigure GitLab:
-
- ```shell
- sudo gitlab-ctl reconfigure
- ```
-
-1. [Migrate any existing local states to the object storage](#migrate-to-object-storage)
+1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation).
+1. [Migrate any existing local states to the object storage](#migrate-to-object-storage).
**For self-compiled installations**
@@ -176,7 +161,7 @@ See [the available connection settings for different providers](object_storage.m
```
1. Save the file and [restart GitLab](restart_gitlab.md#installations-from-source) for the changes to take effect.
-1. [Migrate any existing local states to the object storage](#migrate-to-object-storage)
+1. [Migrate any existing local states to the object storage](#migrate-to-object-storage).
### Migrate to object storage
diff --git a/doc/ci/pipelines/merge_request_pipelines.md b/doc/ci/pipelines/merge_request_pipelines.md
index 045fa8dc16c..e95e15639fd 100644
--- a/doc/ci/pipelines/merge_request_pipelines.md
+++ b/doc/ci/pipelines/merge_request_pipelines.md
@@ -67,7 +67,7 @@ To use merge request pipelines:
## Use `rules` to add jobs
-You can use the [`rules`](../yaml/index.md#rules) keyword to configure jobs to run in
+Use the [`rules`](../yaml/index.md#rules) keyword to configure jobs to run in
merge request pipelines. For example:
```yaml
@@ -97,8 +97,9 @@ job2:
## Use `only` to add jobs
-You can use the [`only`](../yaml/index.md#onlyrefs--exceptrefs) keyword with `merge_requests`
-to configure jobs to run in merge request pipelines.
+[`rules`](#use-rules-to-add-jobs) is the preferred method, but you can also use
+the [`only`](../yaml/index.md#onlyrefs--exceptrefs) keyword with `merge_requests`
+to configure jobs to run in merge request pipelines. For example:
```yaml
job1:
diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md
index a3025144242..e06729dd6be 100644
--- a/doc/integration/jira/connect-app.md
+++ b/doc/integration/jira/connect-app.md
@@ -10,6 +10,8 @@ With the [GitLab for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/
You can use the GitLab for Jira Cloud app to link top-level groups or subgroups. It's not possible to directly link projects or personal namespaces.
+To set up the GitLab for Jira Cloud app:
+
- **For GitLab.com**:
- [Install the GitLab for Jira Cloud app](#install-the-gitlab-for-jira-cloud-app).
- **For self-managed GitLab**, do one of the following:
@@ -18,6 +20,21 @@ You can use the GitLab for Jira Cloud app to link top-level groups or subgroups.
If you use Jira Data Center or Jira Server, use the [Jira DVCS connector](dvcs/index.md) developed and maintained by Atlassian.
+## GitLab data synced to Jira
+
+After you link a group, the following GitLab data is synced to Jira for all projects in that group when you [mention a Jira issue ID](development_panel.md#information-displayed-in-the-development-panel):
+
+- Existing project data (before you linked the group):
+ - The last 400 merge requests
+ - The last 400 branches and the last commit to each of those branches (GitLab 15.11 and later)
+- New project data (after you linked the group):
+ - Merge requests
+ - Branches
+ - Commits
+ - Builds
+ - Deployments
+ - Feature flags
+
## Install the GitLab for Jira Cloud app **(FREE SAAS)**
Prerequisites:
@@ -64,12 +81,6 @@ After you link to a GitLab group, data is synced to Jira for all projects in tha
The initial data sync happens in batches of 20 projects per minute.
For groups with many projects, the data sync for some projects is delayed.
-The following data is synced:
-
-- New and existing merge requests.
-- New branches and commits.
-- Existing branches and commits (GitLab 15.11 and later). You must delete and add any namespaces that were added to the GitLab for Jira Cloud app in GitLab 15.10 and earlier.
-
## Update the GitLab for Jira Cloud app
Most updates to the app are automatic. For more information, see the
diff --git a/doc/integration/jira/development_panel.md b/doc/integration/jira/development_panel.md
index feee089da2e..781487005e1 100644
--- a/doc/integration/jira/development_panel.md
+++ b/doc/integration/jira/development_panel.md
@@ -25,7 +25,7 @@ This table shows the features available with the Jira DVCS connector and the Git
| Sync merge requests | **{check-circle}** Yes | **{check-circle}** Yes |
| Sync branches | **{check-circle}** Yes | **{check-circle}** Yes |
| Sync commits | **{check-circle}** Yes | **{check-circle}** Yes |
-| Sync existing data | **{check-circle}** Yes | **{check-circle}** Yes |
+| Sync existing data | **{check-circle}** Yes | **{check-circle}** Yes (partial) <sup>1</sup>|
| Sync builds | **{dotted-circle}** No | **{check-circle}** Yes |
| Sync deployments | **{dotted-circle}** No | **{check-circle}** Yes |
| Sync feature flags | **{dotted-circle}** No | **{check-circle}** Yes |
@@ -34,6 +34,8 @@ This table shows the features available with the Jira DVCS connector and the Git
| Create merge request from branch | **{check-circle}** Yes | **{check-circle}** Yes |
| Create branch from Jira issue | **{dotted-circle}** No | **{check-circle}** Yes ([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66032) in GitLab 14.2) |
+1. See [GitLab data synced to Jira](connect-app.md#gitlab-data-synced-to-jira).
+
## Connected projects in GitLab
The Jira development panel connects a Jira instance with all its projects to the following:
diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md
index dffb45d30a1..fc849adc2b3 100644
--- a/doc/integration/oauth_provider.md
+++ b/doc/integration/oauth_provider.md
@@ -38,6 +38,7 @@ To create a new application for your user:
1. On the left sidebar, select your avatar.
1. Select **Edit profile**.
1. On the left sidebar, select **Applications**.
+1. Select **Add new application**.
1. Enter a **Name** and **Redirect URI**.
1. Select OAuth 2 **Scopes** as defined in [Authorized Applications](#view-all-authorized-applications).
1. In the **Redirect URI**, enter the URL where users are sent after they authorize with GitLab.
diff --git a/doc/tutorials/build_application.md b/doc/tutorials/build_application.md
index 2160d8ffd2d..c22cba7e0e8 100644
--- a/doc/tutorials/build_application.md
+++ b/doc/tutorials/build_application.md
@@ -28,6 +28,7 @@ Set up runners to run jobs in a pipeline.
| Topic | Description | Good for beginners |
|-------|-------------|--------------------|
+| [Create, register, and run your own project runner](create_register_first_runner/index.md) | Learn the basics of how to create and register a project runner that runs jobs for your project. | **{star}** |
| [Configure GitLab Runner to use the Google Kubernetes Engine](configure_gitlab_runner_to_use_gke/index.md) | Learn how to configure GitLab Runner to use the GKE to run jobs. | |
## Publish a static website
diff --git a/doc/user/profile/comment_templates.md b/doc/user/profile/comment_templates.md
index a9db2d268fe..10b94617f8b 100644
--- a/doc/user/profile/comment_templates.md
+++ b/doc/user/profile/comment_templates.md
@@ -41,6 +41,7 @@ To create a comment template for future use:
1. On the left sidebar, select your avatar.
1. From the dropdown list, select **Preferences**.
1. On the left sidebar, select **Comment templates** (**{comment-lines}**).
+1. Select **Add new**.
1. Provide a **Name** for your comment template.
1. Enter the **Content** of your reply. You can use any formatting you use in
other GitLab text areas.
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 02653591da5..dc6ca994599 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -57,6 +57,7 @@ To add new email to your account:
1. On the left sidebar, select your avatar.
1. Select **Edit profile**.
1. On the left sidebar, select **Emails**.
+1. Select **Add new email**.
1. In the **Email** text box, enter the new email.
1. Select **Add email address**.
1. Verify your email address with the verification email received.
diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md
index a8231460045..624a5a74851 100644
--- a/doc/user/profile/personal_access_tokens.md
+++ b/doc/user/profile/personal_access_tokens.md
@@ -51,6 +51,7 @@ You can create as many personal access tokens as you like.
1. On the left sidebar, select your avatar.
1. Select **Edit profile**.
1. On the left sidebar, select **Access Tokens**.
+1. Select **Add new token**.
1. Enter a name and expiry date for the token.
- The token expires on that date at midnight UTC.
- If you do not enter an expiry date, the expiry date is automatically set to 365 days later than the current date.
diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md
index 8d8639400bd..7155823a0a6 100644
--- a/doc/user/project/repository/gpg_signed_commits/index.md
+++ b/doc/user/project/repository/gpg_signed_commits/index.md
@@ -122,6 +122,7 @@ To add a GPG key to your user settings:
1. On the left sidebar, select your avatar.
1. Select **Edit profile**.
1. Select **GPG Keys** (**{key}**).
+1. Select **Add new key**.
1. In **Key**, paste your _public_ key.
1. To add the key to your account, select **Add key**. GitLab shows the key's
fingerprint, email address, and creation date:
diff --git a/doc/user/ssh.md b/doc/user/ssh.md
index d67423c6ae2..56de81d3f7c 100644
--- a/doc/user/ssh.md
+++ b/doc/user/ssh.md
@@ -325,6 +325,7 @@ To use SSH with GitLab, copy your public key to your GitLab account:
1. On the left sidebar, select your avatar.
1. Select **Edit profile**.
1. On the left sidebar, select **SSH Keys**.
+1. Select **Add new key**.
1. In the **Key** box, paste the contents of your public key.
If you manually copied the key, make sure you copy the entire key,
which starts with `ssh-rsa`, `ssh-dss`, `ecdsa-sha2-nistp256`, `ecdsa-sha2-nistp384`, `ecdsa-sha2-nistp521`,