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
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-08 06:09:37 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-08 06:09:37 +0300
commit1741eab29cacbe9bc0ada51f60496774eb177cc9 (patch)
treea21755b25d99523dd443325d46b2c263932b411f /doc/user/project/merge_requests
parentb4ddc240452f468b7db1662c6cc36d15b9995030 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/merge_requests')
-rw-r--r--doc/user/project/merge_requests/code_quality.md2
-rw-r--r--doc/user/project/merge_requests/creating_merge_requests.md2
-rw-r--r--doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md
index 8cffdc881b2..5a98338a81b 100644
--- a/doc/user/project/merge_requests/code_quality.md
+++ b/doc/user/project/merge_requests/code_quality.md
@@ -131,7 +131,7 @@ stages:
- test
```
-TIP: **Tip:**
+NOTE:
This information is automatically extracted and shown right in the merge request widget.
WARNING:
diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md
index 2d4be285871..5adc4ab6b6e 100644
--- a/doc/user/project/merge_requests/creating_merge_requests.md
+++ b/doc/user/project/merge_requests/creating_merge_requests.md
@@ -46,7 +46,7 @@ the merge request.
![New Merge Request page](img/new_merge_request_page_v12_6.png)
-TIP: **Tip:**
+NOTE:
You can push one or more times to your branch in GitLab before
creating the merge request.
diff --git a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
index 6dc5fe209a2..726a7102663 100644
--- a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
+++ b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
@@ -132,7 +132,7 @@ specific commit page.
![MR diff](img/merge_request_diff.png)
-TIP: **Tip:**
+NOTE:
You can append `?w=1` while on the diffs page of a merge request to ignore any
whitespace changes.