diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 03:10:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 03:10:37 +0300 |
| commit | 5ee9033e9db11ce04f5cc6d7bda32f8059a1f405 (patch) | |
| tree | 37a34a5ecc9c5c4cb3338e2f8eb12409891bd1f4 /changelogs | |
| parent | cd8520845d9205622b5acf301b68c0ac7d81aaec (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/200002-changes-will-be-lost-if-multiple-people-edit-a-wiki-page.yml b/changelogs/unreleased/200002-changes-will-be-lost-if-multiple-people-edit-a-wiki-page.yml new file mode 100644 index 00000000000..e1c5815c77b --- /dev/null +++ b/changelogs/unreleased/200002-changes-will-be-lost-if-multiple-people-edit-a-wiki-page.yml @@ -0,0 +1,5 @@ +--- +title: Preserve user changes in the wiki editor if multiple people edit the page +merge_request: 61120 +author: +type: fixed diff --git a/changelogs/unreleased/329511-enable-by-default-execute-batched-migrations-on-schedule.yml b/changelogs/unreleased/329511-enable-by-default-execute-batched-migrations-on-schedule.yml new file mode 100644 index 00000000000..3dd6051c628 --- /dev/null +++ b/changelogs/unreleased/329511-enable-by-default-execute-batched-migrations-on-schedule.yml @@ -0,0 +1,5 @@ +--- +title: Enable by default scheduled execution of batched background migrations +merge_request: 61316 +author: +type: added |