diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:19 +0300 |
| commit | 7915c41e4261719719e791602c8235574157164c (patch) | |
| tree | 6c1fc8c4ad4e974878c879fcc2c7c8f7d56d0cee /changelogs | |
| parent | 495c22d1245b6212b21b7379a542df73dfa77206 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/asciidoc-attr.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/user-post-diff-notes.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/asciidoc-attr.yml b/changelogs/unreleased/asciidoc-attr.yml new file mode 100644 index 00000000000..491c099fa83 --- /dev/null +++ b/changelogs/unreleased/asciidoc-attr.yml @@ -0,0 +1,5 @@ +--- +title: Support Asciidoc docname attribute +merge_request: 22313 +author: Jouke Witteveen +type: added diff --git a/changelogs/unreleased/user-post-diff-notes.yml b/changelogs/unreleased/user-post-diff-notes.yml new file mode 100644 index 00000000000..d6885d8d765 --- /dev/null +++ b/changelogs/unreleased/user-post-diff-notes.yml @@ -0,0 +1,5 @@ +--- +title: Fix duplicate spec in user post diff notes +merge_request: 28859 +author: Rajendra Kadam +type: added |