diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-03 06:14:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-03 06:14:42 +0300 |
commit | c657078ecb4bff69e58f6911713e143c99f2c71f (patch) | |
tree | 5a4dc8bf80b14c3202de9c7bd51363f3d73af541 /doc/user/project | |
parent | 498ba9dc41fcf2b4be30a8f3721543953efb3c3b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
-rw-r--r-- | doc/user/project/integrations/asana.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/hangouts_chat.md | 4 | ||||
-rw-r--r-- | doc/user/project/integrations/mattermost.md | 4 | ||||
-rw-r--r-- | doc/user/project/integrations/pivotal_tracker.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/slack.md | 4 | ||||
-rw-r--r-- | doc/user/project/labels.md | 6 | ||||
-rw-r--r-- | doc/user/project/merge_requests/approvals/rules.md | 2 | ||||
-rw-r--r-- | doc/user/project/merge_requests/cherry_pick_changes.md | 2 | ||||
-rw-r--r-- | doc/user/project/merge_requests/reviews/index.md | 2 | ||||
-rw-r--r-- | doc/user/project/pages/getting_started/pages_forked_sample_project.md | 6 | ||||
-rw-r--r-- | doc/user/project/repository/forking_workflow.md | 2 | ||||
-rw-r--r-- | doc/user/project/working_with_projects.md | 2 |
12 files changed, 19 insertions, 19 deletions
diff --git a/doc/user/project/integrations/asana.md b/doc/user/project/integrations/asana.md index 963fca34827..b4d7790df1d 100644 --- a/doc/user/project/integrations/asana.md +++ b/doc/user/project/integrations/asana.md @@ -37,7 +37,7 @@ Complete these steps in GitLab: 1. Select **Asana**. 1. Ensure that the **Active** toggle is enabled. 1. Paste the token you generated in Asana. -1. (Optional) To restrict this setting to specific branches, list them in the **Restrict to branch** +1. Optional. To restrict this setting to specific branches, list them in the **Restrict to branch** field, separated with commas. 1. Select **Save changes** or optionally select **Test settings**. diff --git a/doc/user/project/integrations/hangouts_chat.md b/doc/user/project/integrations/hangouts_chat.md index bcaedbc4b10..7a96bb74e3f 100644 --- a/doc/user/project/integrations/hangouts_chat.md +++ b/doc/user/project/integrations/hangouts_chat.md @@ -32,7 +32,7 @@ Select a room and create a webhook: 1. Enter the room where you want to receive notifications from GitLab. 1. Open the room dropdown menu on the top-left and select **Manage webhooks**. 1. Enter the name for your webhook, for example "GitLab integration". -1. (Optional) Add an avatar for your bot. +1. Optional. Add an avatar for your bot. 1. Select **Save**. 1. Copy the webhook URL. @@ -46,7 +46,7 @@ Enable the Google Chat integration in GitLab: 1. Scroll down to the end of the page where you find a **Webhook** field. 1. Enter the webhook URL you copied from Google Chat. 1. Select the events you want to be notified about in your Google Chat room. -1. (Optional) Select **Test settings** to verify the connection. +1. Optional. Select **Test settings** to verify the connection. 1. Select **Save changes**. To test the integration, make a change based on the events you selected and diff --git a/doc/user/project/integrations/mattermost.md b/doc/user/project/integrations/mattermost.md index 119f219499c..f3f8d900e12 100644 --- a/doc/user/project/integrations/mattermost.md +++ b/doc/user/project/integrations/mattermost.md @@ -50,12 +50,12 @@ Then fill in the integration configuration: - **Webhook**: The incoming webhook URL on Mattermost, similar to `http://mattermost.example/hooks/5xo…`. -- **Username**: (Optional) The username shown in messages sent to Mattermost. +- **Username**: Optional. The username shown in messages sent to Mattermost. To change the bot's username, provide a value. - **Notify only broken pipelines**: If you enable the **Pipeline** event, and you want notifications about failed pipelines only. - **Branches for which notifications are to be sent**: The branches to send notifications for. -- **Labels to be notified**: (Optional) Labels required for the issue or merge request +- **Labels to be notified**: Optional. Labels required for the issue or merge request to trigger a notification. Leave blank to notify for all issues and merge requests. - **Labels to be notified behavior**: When you use the **Labels to be notified** filter, messages are sent when an issue or merge request contains _any_ of the labels specified diff --git a/doc/user/project/integrations/pivotal_tracker.md b/doc/user/project/integrations/pivotal_tracker.md index 93a3490e4b6..8b17f4afaa8 100644 --- a/doc/user/project/integrations/pivotal_tracker.md +++ b/doc/user/project/integrations/pivotal_tracker.md @@ -42,6 +42,6 @@ Complete these steps in GitLab: 1. Select **Pivotal Tracker**. 1. Ensure that the **Active** toggle is enabled. 1. Paste the token you generated in Pivotal Tracker. -1. (Optional) To restrict this setting to specific branches, list them in the **Restrict to branch** +1. Optional. To restrict this setting to specific branches, list them in the **Restrict to branch** field, separated with commas. 1. Select **Save changes** or optionally select **Test settings**. diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md index d399c7f2901..87f38c3482b 100644 --- a/doc/user/project/integrations/slack.md +++ b/doc/user/project/integrations/slack.md @@ -31,7 +31,7 @@ to control GitLab from Slack. Slash commands are configured separately. [Triggers for Slack notifications](#triggers-for-slack-notifications). By default, messages are sent to the channel you configured during [Slack configuration](#configure-slack). -1. (Optional) To send messages to a different channel, multiple channels, or as +1. Optional. To send messages to a different channel, multiple channels, or as a direct message: - *To send messages to channels,* enter the Slack channel names, separated by commas. @@ -42,7 +42,7 @@ to control GitLab from Slack. Slash commands are configured separately. 1. In **Webhook**, enter the webhook URL you copied in the [Slack configuration](#configure-slack) step. -1. (Optional) In **Username**, enter the username of the Slack bot that sends +1. Optional. In **Username**, enter the username of the Slack bot that sends the notifications. 1. Select the **Notify only broken pipelines** checkbox to notify only on failures. 1. In the **Branches for which notifications are to be sent** dropdown, select which types of branches diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md index 91f12a36070..3a91a33fc4d 100644 --- a/doc/user/project/labels.md +++ b/doc/user/project/labels.md @@ -72,9 +72,9 @@ To create a new project label: 1. Select the **New label** button. 1. In the **Title** field, enter a short, descriptive name for the label. You can also use this field to create [scoped, mutually exclusive labels](#scoped-labels). -1. (Optional) In the **Description** field, you can enter additional +1. Optional. In the **Description** field, you can enter additional information about how and when to use this label. -1. (Optional) Select a background color for the label by selecting one of the +1. Optional. Select a background color for the label by selecting one of the available colors, or by entering a hex color value in the **Background color** field. 1. Select **Create label**. @@ -86,7 +86,7 @@ label section of the right sidebar of an issue or a merge request: 1. Click **Create project label**. - Fill in the name field. Note that you can't specify a description if creating a label this way. You can add a description later by editing the label (see below). - - (Optional) Select a color by clicking on the available colors, or input a hex + - Optional. Select a color by clicking on the available colors, or input a hex color value for a specific color. 1. Click **Create**. diff --git a/doc/user/project/merge_requests/approvals/rules.md b/doc/user/project/merge_requests/approvals/rules.md index 1249aa826fa..f4393b2b76d 100644 --- a/doc/user/project/merge_requests/approvals/rules.md +++ b/doc/user/project/merge_requests/approvals/rules.md @@ -63,7 +63,7 @@ To edit a merge request approval rule: 1. Go to your project and select **Settings > General**. 1. Expand **Merge request (MR) approvals**, and then select **Edit**. -1. (Optional) Change the **Rule name**. +1. Optional. Change the **Rule name**. 1. Set the number of required approvals in **Approvals required**. The minimum value is `0`. 1. Add or remove eligible approvers, as needed: - *To add users or groups as approvers,* search for users or groups that are diff --git a/doc/user/project/merge_requests/cherry_pick_changes.md b/doc/user/project/merge_requests/cherry_pick_changes.md index 54e411fa9c9..15ba6e9de98 100644 --- a/doc/user/project/merge_requests/cherry_pick_changes.md +++ b/doc/user/project/merge_requests/cherry_pick_changes.md @@ -76,7 +76,7 @@ merge request is from a fork: 1. Click on the **Options** dropdown and select **Cherry-pick** to show the cherry-pick modal. 1. In **Pick into project** and **Pick into branch**, select the destination project and branch: ![Cherry-pick commit](img/cherry_pick_into_project_v13_11.png) -1. (Optional) Select **Start a new merge request** if you're ready to create a merge request. +1. Optional. Select **Start a new merge request** if you're ready to create a merge request. 1. Click **Cherry-pick**. ## Related topics diff --git a/doc/user/project/merge_requests/reviews/index.md b/doc/user/project/merge_requests/reviews/index.md index 597dcb3dfb9..be26ce9176f 100644 --- a/doc/user/project/merge_requests/reviews/index.md +++ b/doc/user/project/merge_requests/reviews/index.md @@ -43,7 +43,7 @@ To start your review: - **Add to review**: Keep this comment private and add to the current review. These review comments are marked **Pending** and are visible only to you. - **Add comment now**: Submits the specific comment as a regular comment instead of as part of the review. -1. (Optional) You can use [quick actions](../../quick_actions.md) inside review comments. +1. Optional. You can use [quick actions](../../quick_actions.md) inside review comments. The comment shows the actions to perform after publication, but does not perform them until you submit your review. 1. When your review is complete, you can [submit the review](#submit-a-review). Your comments diff --git a/doc/user/project/pages/getting_started/pages_forked_sample_project.md b/doc/user/project/pages/getting_started/pages_forked_sample_project.md index 7640bf1f72d..70b3e1543e7 100644 --- a/doc/user/project/pages/getting_started/pages_forked_sample_project.md +++ b/doc/user/project/pages/getting_started/pages_forked_sample_project.md @@ -18,9 +18,9 @@ configured to generate a Pages site. To fork a sample project and create a Pages website: 1. View the sample projects by navigating to the [GitLab Pages examples](https://gitlab.com/pages) group. -1. Click the name of the project you want to [fork](../../../../user/project/working_with_projects.md#fork-a-project). -1. In the top right, click the **Fork** button, and then choose a namespace to fork to. -1. Go to your project's **CI/CD > Pipelines** and click **Run pipeline**. +1. Select the name of the project you want to [fork](../../../../user/project/working_with_projects.md#fork-a-project). +1. In the top right, select **Fork** and then choose a namespace to fork to. +1. For your project, on the left sidebar, select **CI/CD > Pipelines** and then **Run pipeline**. GitLab CI/CD builds and deploys your site. The site can take approximately 30 minutes to deploy. diff --git a/doc/user/project/repository/forking_workflow.md b/doc/user/project/repository/forking_workflow.md index bf4ef21e31b..13fd9572dc5 100644 --- a/doc/user/project/repository/forking_workflow.md +++ b/doc/user/project/repository/forking_workflow.md @@ -101,7 +101,7 @@ To use it, follow the instructions at [Creating a fork](#creating-a-fork) and pr - The project name. - The project URL. - The project slug. -- *(Optional)* The project description. +- Optional. The project description. - The visibility level for your fork. ### Enable or disable the fork project form **(FREE SELF)** diff --git a/doc/user/project/working_with_projects.md b/doc/user/project/working_with_projects.md index 1c95f2bb5ec..03e7ca6db4a 100644 --- a/doc/user/project/working_with_projects.md +++ b/doc/user/project/working_with_projects.md @@ -194,7 +194,7 @@ To push a new project: remote: The private project namespace/myproject was created. ``` -1. (Optional) To configure the remote, alter the command +1. Optional. To configure the remote, alter the command `git remote add origin https://gitlab.example.com/namespace/myproject.git` to match your namespace and project names. |