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 /Gemfile.lock | |
| 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 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b19dc5b6d20..d58d8535cdc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,6 +164,8 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) + devise-async (0.9.0) + devise (~> 3.2) devise-two-factor (2.0.1) activesupport attr_encrypted (~> 1.3.2) @@ -920,6 +922,7 @@ DEPENDENCIES database_cleaner (~> 1.4.0) default_value_for (~> 3.0.0) devise (~> 3.5.4) + devise-async (~> 0.9.0) devise-two-factor (~> 2.0.0) diffy (~> 3.0.3) doorkeeper (~> 3.1) |