diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-12 12:53:31 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-12 12:53:31 +0300 |
commit | 8e2666bf725ae582b20031cdb4345e3484a200d7 (patch) | |
tree | e71e37b16313734665f78d6539d2925fca6d6b23 /doc/user | |
parent | 74efd580bd96c4364b72d51d71e487c211fded7e (diff) | |
parent | f751748d382782b0c2bd0f75fbf575d8b2c42a86 (diff) |
Merge branch 'docs-image-alignment' into 'master'
Fix markdown spacing in various docs (part 3)
See merge request gitlab-org/gitlab-ce!31709
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/admin_area/license.md | 12 | ||||
-rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 6 | ||||
-rw-r--r-- | doc/user/discussions/index.md | 22 |
3 files changed, 20 insertions, 20 deletions
diff --git a/doc/user/admin_area/license.md b/doc/user/admin_area/license.md index bbd04146eb2..f5864e1f828 100644 --- a/doc/user/admin_area/license.md +++ b/doc/user/admin_area/license.md @@ -30,22 +30,22 @@ Otherwise, you can: 1. Navigate manually to the **Admin Area** by clicking the wrench icon in the menu bar. - ![Admin area icon](img/admin_wrench.png) + ![Admin area icon](img/admin_wrench.png) 1. And then going to the **License** tab and click on **Upload New License**. - ![License admin area](img/license_admin_area.png) + ![License admin area](img/license_admin_area.png) 1. If you've received a `.gitlab-license` file, you should have already downloaded it in your local machine. You can then upload it directly by choosing the license file and clicking the **Upload license** button. In the image below, you can see that the selected license file is named `GitLab.gitlab-license`. - ![Upload license](img/license_upload.png) + ![Upload license](img/license_upload.png) - If you've received your license as plain text, you need to select the - "Enter license key" option, copy the license, paste it into the "License key" - field and click **Upload license**. + If you've received your license as plain text, you need to select the + "Enter license key" option, copy the license, paste it into the "License key" + field and click **Upload license**. ## Add your license at install time diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index e05b3395535..43640f1b16a 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -107,18 +107,18 @@ In order to purchase additional minutes, you should follow these steps: 1. Go to **Group > Settings > Pipelines quota**. Once you are on that page, click on **Buy additional minutes**. - ![Buy additional minutes](img/buy_btn.png) + ![Buy additional minutes](img/buy_btn.png) 1. Locate the subscription card that is linked to your group on GitLab.com, click on **Buy more CI minutes**, and complete the details about the transaction. - ![Buy additional minutes](img/buy_minutes_card.png) + ![Buy additional minutes](img/buy_minutes_card.png) 1. Once we have processed your payment, the extra CI minutes will be synced to your Group and you can visualize it from the **Group > Settings > Pipelines quota** page: - ![Additional minutes](img/additional_minutes.png) + ![Additional minutes](img/additional_minutes.png) Be aware that: diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index f844f56557f..6891682141c 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -22,7 +22,7 @@ higher can also edit a comment made by someone else. You can also reply to a comment notification email to reply to the comment if [Reply by email] is configured for your GitLab instance. Replying to a standard comment creates another standard comment. Replying to a threaded comment creates a reply in the thread. Email replies support - [Markdown] and [quick actions], just as if you replied from the web. +[Markdown] and [quick actions], just as if you replied from the web. ## Resolvable comments and threads @@ -58,17 +58,17 @@ To create a commit diff thread: 1. Navigate to the merge request **Commits** tab. A list of commits that constitute the merge request will be shown. - ![Merge request commits tab](img/merge_request_commits_tab.png) + ![Merge request commits tab](img/merge_request_commits_tab.png) 1. Navigate to a specific commit, click on the **Changes** tab (where you will only be presented diffs from the selected commit), and leave a comment. - ![Commit diff discussion in merge request context](img/commit_comment_mr_context.png) + ![Commit diff discussion in merge request context](img/commit_comment_mr_context.png) 1. Any threads created this way will be shown in the merge request's **Discussions** tab and are resolvable. - ![Merge request Discussions tab](img/commit_comment_mr_discussions_tab.png) + ![Merge request Discussions tab](img/commit_comment_mr_discussions_tab.png) Threads created this way will only appear in the original merge request and not when navigating to that commit under your project's @@ -343,8 +343,8 @@ bottom of the screen with two buttons: - **Discard**: Discards all comments that have not been submitted. - **Finish review**: Opens a list of comments ready to be submitted for review. - Clicking **Submit review** will publish all comments. Any quick actions - submitted are performed at this time. + Clicking **Submit review** will publish all comments. Any quick actions + submitted are performed at this time. Alternatively, every pending comment has a button to finish the entire review. @@ -389,18 +389,18 @@ the Merge Request authored by the user that applied them. 1. Choose a line of code to be changed, add a new comment, then click on the **Insert suggestion** icon in the toolbar: - ![Add a new comment](img/insert_suggestion.png) + ![Add a new comment](img/insert_suggestion.png) 1. In the comment, add your suggestion to the pre-populated code block: - ![Add a suggestion into a code block tagged properly](img/make_suggestion.png) + ![Add a suggestion into a code block tagged properly](img/make_suggestion.png) 1. Click **Comment**. - The suggestions in the comment can be applied by the merge request author - directly from the merge request: + The suggestions in the comment can be applied by the merge request author + directly from the merge request: - ![Apply suggestions](img/suggestion.png) + ![Apply suggestions](img/suggestion.png) Once the author applies a suggestion, it will be marked with the **Applied** label, the thread will be automatically resolved, and GitLab will create a new commit |