diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 18:06:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 18:06:32 +0300 |
| commit | 6f9edd1a4c4942d3d13ec54793cfae56164b1a0a (patch) | |
| tree | f118f4a1dcad2db7b35ab15157e16eef56eba860 /changelogs | |
| parent | 94e614c94c0a42e261e6af88c89461d90f3330c0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/16790-render-xml-artifacts.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-any-approver-handling.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/16790-render-xml-artifacts.yml b/changelogs/unreleased/16790-render-xml-artifacts.yml new file mode 100644 index 00000000000..d9cfcc04a68 --- /dev/null +++ b/changelogs/unreleased/16790-render-xml-artifacts.yml @@ -0,0 +1,5 @@ +--- +title: Render xml artifact files in GitLab +merge_request: 16790 +author: +type: added diff --git a/changelogs/unreleased/sh-fix-any-approver-handling.yml b/changelogs/unreleased/sh-fix-any-approver-handling.yml new file mode 100644 index 00000000000..4230dce3b74 --- /dev/null +++ b/changelogs/unreleased/sh-fix-any-approver-handling.yml @@ -0,0 +1,5 @@ +--- +title: Fix bug that caused a merge to show an error message +merge_request: 17466 +author: +type: fixed |