diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-05-03 15:37:59 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-05-03 15:43:51 -0600 |
| commit | 3004386b55fede6381e5e0794c12625e2b83de25 (patch) | |
| tree | 274f89afa65a0bfc5e1913c2c6dd9a9465a72392 /Gemfile.lock | |
| parent | a0ea38c356889f8cca26ee389f6a466b03a6e057 (diff) | |
| download | gitlab-ce-3004386b55fede6381e5e0794c12625e2b83de25.tar.gz | |
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.
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 b1e954e0884..ae91b0fb6dd 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) |