diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-11 08:43:10 +0200 |
|---|---|---|
| committer | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-11 08:43:10 +0200 |
| commit | a2f7936c74e6c9c4eed7b1c5641f0c43d4ff1375 (patch) | |
| tree | 82b1ea27fe2a9a1be884467e10d9bde688ce97d1 /doc/user/project/merge_requests/versions.md | |
| parent | bfd2181310097f5c0a92a43ffc2b7b9540b96ad3 (diff) | |
| parent | 2f990e3408d00cad473d8dcf8a4e49155cc3cc33 (diff) | |
| download | gitlab-ce-a2f7936c74e6c9c4eed7b1c5641f0c43d4ff1375.tar.gz | |
merge master and resolve conflicts
Diffstat (limited to 'doc/user/project/merge_requests/versions.md')
| -rw-r--r-- | doc/user/project/merge_requests/versions.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/user/project/merge_requests/versions.md b/doc/user/project/merge_requests/versions.md index 610250ccf12..90500fd9c21 100644 --- a/doc/user/project/merge_requests/versions.md +++ b/doc/user/project/merge_requests/versions.md @@ -1,12 +1,12 @@ # Merge requests versions ->**Notes:** -- [Introduced][ce-5467] in GitLab 8.12. -- Comments are disabled while viewing outdated merge versions or comparing to - versions other than base. -- Merge request versions are based on push not on commit. So, if you pushed 5 - commits in a single push, it will be a single option in the dropdown. If you - pushed 5 times, that will count for 5 options. +> **Notes:** +> - [Introduced][ce-5467] in GitLab 8.12. +> - Comments are disabled while viewing outdated merge versions or comparing to +> versions other than base. +> - Merge request versions are based on push not on commit. So, if you pushed 5 +> commits in a single push, it will be a single option in the dropdown. If you +> pushed 5 times, that will count for 5 options. Every time you push to a branch that is tied to a merge request, a new version of merge request diff is created. When you visit a merge request that contains |