diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:46 +0000 |
commit | ee7de3a24d62376916d78649d7e477a184b2e203 (patch) | |
tree | b782b1d7e7762cdcc1a54073a4115fdb3ad7a22c /changelogs | |
parent | e4ea43b2b85ad5f3115f00220601eb719705139a (diff) | |
download | gitlab-ce-ee7de3a24d62376916d78649d7e477a184b2e203.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/georgekoltsov-add-epics-activity-to-group-export.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/sh-trim-extra-periods-merge-error.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/georgekoltsov-add-epics-activity-to-group-export.yml b/changelogs/unreleased/georgekoltsov-add-epics-activity-to-group-export.yml new file mode 100644 index 00000000000..ae7169649f2 --- /dev/null +++ b/changelogs/unreleased/georgekoltsov-add-epics-activity-to-group-export.yml @@ -0,0 +1,5 @@ +--- +title: Add Epics Activity information to Group Export +merge_request: 23613 +author: +type: changed diff --git a/changelogs/unreleased/sh-trim-extra-periods-merge-error.yml b/changelogs/unreleased/sh-trim-extra-periods-merge-error.yml new file mode 100644 index 00000000000..42b1b3b3d8f --- /dev/null +++ b/changelogs/unreleased/sh-trim-extra-periods-merge-error.yml @@ -0,0 +1,5 @@ +--- +title: Trim extra period when merge error displayed +merge_request: 23737 +author: +type: fixed |