summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-05-19 13:52:08 -0500
committerConnor Shea <connor.james.shea@gmail.com>2016-05-30 13:51:21 -0600
commitd47b2b92c9b5e80eb3430e2b4950e17646b8efd8 (patch)
tree93bd5ec1652e4147fbe862efd9c9566b50b7a43f /config
parentde20bd5b31715f096db3fb0155c82b0eea992b6c (diff)
downloadgitlab-ce-d47b2b92c9b5e80eb3430e2b4950e17646b8efd8.tar.gz
Upgrade devise and devise-two-factor, remove devise-async
Devise (3.5.4 => 4.1.1) Changelog: https://github.com/plataformatec/devise/blob/master/CHANGELOG.md devise-two-factor (2.0.1 => 3.0.0) Changelog: https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md These are reliant on each other, so they have to be upgraded together. devise-async is no longer necessary as Devise 4.1 fixes a bug with the ActiveJob integration.
Diffstat (limited to 'config')
-rw-r--r--config/initializers/devise_async.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
deleted file mode 100644
index 05a1852cdbd..00000000000
--- a/config/initializers/devise_async.rb
+++ /dev/null
@@ -1 +0,0 @@
-Devise::Async.backend = :sidekiq