diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -15,7 +15,7 @@ gem "mysql2", group: :mysql gem "pg", group: :postgres # Auth -gem "devise" +gem "devise", '~> 2.2' gem 'omniauth', "~> 1.1.3" gem 'omniauth-google-oauth2' gem 'omniauth-twitter' diff --git a/Gemfile.lock b/Gemfile.lock index d0ee20f34e7..a2515c289ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,7 +49,7 @@ GEM asciidoctor (0.1.3) awesome_print (1.1.0) backports (3.3.2) - bcrypt-ruby (3.0.1) + bcrypt-ruby (3.1.1) better_errors (0.9.0) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -111,7 +111,7 @@ GEM database_cleaner (1.0.1) debug_inspector (0.0.2) descendants_tracker (0.0.1) - devise (2.2.4) + devise (2.2.5) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) @@ -535,7 +535,7 @@ GEM virtus (0.5.5) backports (~> 3.3) descendants_tracker (~> 0.0.1) - warden (1.2.1) + warden (1.2.3) rack (>= 1.0) webmock (1.11.0) addressable (>= 2.2.7) @@ -564,7 +564,7 @@ DEPENDENCIES coveralls d3_rails (~> 3.1.4) database_cleaner - devise + devise (~> 2.2) email_spec enumerize factory_girl_rails |