diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 15:09:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 15:09:00 +0000 |
| commit | c282dba898a4cb0645f88579339502a4e3778727 (patch) | |
| tree | 94a6457ce4438e085c9ae43bc51a2b5a29787bf2 /changelogs | |
| parent | 2c2dd5e36c4ed5f09f488be288882d98f9124d12 (diff) | |
| download | gitlab-ce-c282dba898a4cb0645f88579339502a4e3778727.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/33071-update-kaminari-templates.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/33257-prevent-accidental-deletions-via-soft-delete-for-groups-ui-changes.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/33071-update-kaminari-templates.yml b/changelogs/unreleased/33071-update-kaminari-templates.yml new file mode 100644 index 00000000000..7e43cce729d --- /dev/null +++ b/changelogs/unreleased/33071-update-kaminari-templates.yml @@ -0,0 +1,5 @@ +--- +title: Update Kaminari templates to match gl-pagination's markup +merge_request: 23582 +author: +type: other diff --git a/changelogs/unreleased/33257-prevent-accidental-deletions-via-soft-delete-for-groups-ui-changes.yml b/changelogs/unreleased/33257-prevent-accidental-deletions-via-soft-delete-for-groups-ui-changes.yml new file mode 100644 index 00000000000..c3c722339cd --- /dev/null +++ b/changelogs/unreleased/33257-prevent-accidental-deletions-via-soft-delete-for-groups-ui-changes.yml @@ -0,0 +1,5 @@ +--- +title: Add UI for 'soft-delete for groups' feature +merge_request: 19483 +author: +type: added |