diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 18:09:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 18:09:15 +0300 |
| commit | 536aa3a1f4b96abc4ca34489bf2cbe503afcded7 (patch) | |
| tree | 88d08f7dfa29a32d6526773c4fe0fefd9f2bc7d1 /doc/user/project/issues | |
| parent | 50ae4065530c4eafbeb7c5ff2c462c48c02947ca (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/issues')
| -rw-r--r-- | doc/user/project/issues/associate_zoom_meeting.md | 4 | ||||
| -rw-r--r-- | doc/user/project/issues/design_management.md | 6 | ||||
| -rw-r--r-- | doc/user/project/issues/managing_issues.md | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/doc/user/project/issues/associate_zoom_meeting.md b/doc/user/project/issues/associate_zoom_meeting.md index 24775204c9f..a11fb4a7438 100644 --- a/doc/user/project/issues/associate_zoom_meeting.md +++ b/doc/user/project/issues/associate_zoom_meeting.md @@ -15,7 +15,7 @@ To associate a zoom meeting with an issue, you can use GitLab's In an issue, leave a comment using the `/zoom` quick action followed by a valid Zoom link: -```sh +```shell /zoom https://zoom.us/j/123456789 ``` @@ -34,7 +34,7 @@ need to [remove it](#removing-an-existing-zoom-meeting-from-an-issue) first. Similarly to adding a zoom meeting, you can remove it with a quick action: -```sh +```shell /remove_zoom ``` diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md index b8983a06180..80075efe4ac 100644 --- a/doc/user/project/issues/design_management.md +++ b/doc/user/project/issues/design_management.md @@ -75,6 +75,12 @@ of the design, and will replace the previous version. Designs cannot be added if the issue has been moved, or its [discussion is locked](../../discussions/#lock-discussions). +### Skipped designs + +Designs with the same filename as an existing uploaded design _and_ whose content has not changed will be skipped. +This means that no new version of the design will be created. When designs are skipped, you will be made aware via a warning +message on the Issue. + ## Viewing designs Images on the Design Management page can be enlarged by clicking on them. diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md index ff360e973aa..c6444259f25 100644 --- a/doc/user/project/issues/managing_issues.md +++ b/doc/user/project/issues/managing_issues.md @@ -178,7 +178,7 @@ Closes #4, #6, and https://gitlab.com/<username>/<projectname>/issues/<xxx> When not specified, the default issue closing pattern as shown below will be used: -```bash +```shell ((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)|[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+) ``` |