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 | |
| 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')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -20,6 +20,7 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 3.5.4' gem 'doorkeeper', '~> 3.1' +gem 'devise-async', '~> 0.9.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' |