diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-04 13:55:00 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-04 13:55:00 +0000 |
| commit | 275c615557595996f704c9f45b16f435fc70b8e2 (patch) | |
| tree | 212b66a5c7ddd98e6feed0d522a2ed85f0186ae2 /CHANGELOG | |
| parent | 622ad2355a5b780091def7f7752ac88c97520dbb (diff) | |
| parent | 3004386b55fede6381e5e0794c12625e2b83de25 (diff) | |
| download | gitlab-ce-275c615557595996f704c9f45b16f435fc70b8e2.tar.gz | |
Merge branch 'revert-devise-async' into 'master'
Revert "Remove the Devise Async gem."
This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978.
It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
Resolves #17250.
See merge request !4027
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4c68c836080..9e3e9aa0fdf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,7 +10,6 @@ v 8.8.0 (unreleased) - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project - Updated search UI - Display informative message when new milestone is created - - Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea) - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea) - Added button to toggle whitespaces changes on diff view - Backport GitLab Enterprise support from EE |