diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 15 |
2 files changed, 10 insertions, 9 deletions
@@ -21,8 +21,8 @@ gem "mysql2", group: :mysql gem "pg", group: :postgres # Auth -gem "devise", '3.0.4' -gem "devise-async", '0.8.0' +gem "devise", '3.2.4' +gem "devise-async", '0.9.0' gem 'omniauth', "~> 1.1.3" gem 'omniauth-google-oauth2' gem 'omniauth-twitter' diff --git a/Gemfile.lock b/Gemfile.lock index d5898dbdf6f..97d3d8bab64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM axiom-types (0.0.5) descendants_tracker (~> 0.0.1) ice_nine (~> 0.9) - bcrypt-ruby (3.1.2) + bcrypt (3.1.7) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -94,13 +94,14 @@ GEM default_value_for (3.0.0) activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.3) - devise (3.0.4) - bcrypt-ruby (~> 3.0) + devise (3.2.4) + bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) warden (~> 1.2.3) - devise-async (0.8.0) - devise (>= 2.2, < 3.2) + devise-async (0.9.0) + devise (~> 3.2) diff-lcs (1.2.5) diffy (3.0.3) docile (1.1.1) @@ -584,8 +585,8 @@ DEPENDENCIES d3_rails (~> 3.1.4) database_cleaner default_value_for (~> 3.0.0) - devise (= 3.0.4) - devise-async (= 0.8.0) + devise (= 3.2.4) + devise-async (= 0.9.0) diffy (~> 3.0.3) dropzonejs-rails email_spec |