diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 00:08:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 00:08:11 +0000 |
| commit | 93dcf45d441bc884b167f4338380c8c888e9b86f (patch) | |
| tree | f55e8c1d39013380d1ff7d2a4e3cca537a35192a /changelogs | |
| parent | 0e68afab211a172b862a7acc774e1eda5da8e471 (diff) | |
| download | gitlab-ce-93dcf45d441bc884b167f4338380c8c888e9b86f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/210492-revert-ldap-readonly-sync.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/26391-move-alerting-feature-to-core.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/210492-revert-ldap-readonly-sync.yml b/changelogs/unreleased/210492-revert-ldap-readonly-sync.yml new file mode 100644 index 00000000000..def24208afa --- /dev/null +++ b/changelogs/unreleased/210492-revert-ldap-readonly-sync.yml @@ -0,0 +1,5 @@ +--- +title: Revert LDAP readonly attributes feature +merge_request: 28541 +author: +type: removed diff --git a/changelogs/unreleased/26391-move-alerting-feature-to-core.yml b/changelogs/unreleased/26391-move-alerting-feature-to-core.yml new file mode 100644 index 00000000000..83173fe7ace --- /dev/null +++ b/changelogs/unreleased/26391-move-alerting-feature-to-core.yml @@ -0,0 +1,5 @@ +--- +title: Move Alerting feature to Core +merge_request: 28196 +author: +type: changed |