diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-05-19 13:52:08 -0500 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-05-30 13:51:21 -0600 |
| commit | d47b2b92c9b5e80eb3430e2b4950e17646b8efd8 (patch) | |
| tree | 93bd5ec1652e4147fbe862efd9c9566b50b7a43f /Gemfile | |
| parent | de20bd5b31715f096db3fb0155c82b0eea992b6c (diff) | |
| download | gitlab-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 'Gemfile')
| -rw-r--r-- | Gemfile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -18,9 +18,8 @@ gem "mysql2", '~> 0.3.16', group: :mysql gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries -gem 'devise', '~> 3.5.4' +gem 'devise', '~> 4.0' 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' @@ -43,7 +42,7 @@ gem 'recaptcha', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' # Two-factor authentication -gem 'devise-two-factor', '~> 2.0.0' +gem 'devise-two-factor', '~> 3.0.0' gem 'rqrcode-rails3', '~> 0.1.7' gem 'attr_encrypted', '~> 1.3.4' |