diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-09-19 21:12:32 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-09-19 21:12:32 -0400 |
commit | ce8f78a57168bbacb1320a4dc4e9e79b878221d4 (patch) | |
tree | 70bbc15e2054c8df7885dc9d0fd15b5e0fd1d400 | |
parent | 5a8d73243a7b68f2724a6d5f9d482dda24e9dfe4 (diff) | |
download | gitlab-ce-ce8f78a57168bbacb1320a4dc4e9e79b878221d4.tar.gz |
Bump devise to 3.5.2
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 10 insertions, 4 deletions
@@ -22,7 +22,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries -gem "devise", '~> 3.2.4' +gem "devise", '~> 3.5.2' gem "devise-async", '~> 0.9.0' gem 'omniauth', "~> 1.2.2" gem 'omniauth-google-oauth2', '~> 0.2.5' diff --git a/Gemfile.lock b/Gemfile.lock index f43e885ce48..a8a067eb785 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -136,10 +136,11 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (3.2.4) + devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + responders thread_safe (~> 0.1) warden (~> 1.2.3) devise-async (0.9.0) @@ -148,7 +149,7 @@ GEM activemodel activesupport attr_encrypted (~> 1.3.2) - devise (>= 3.2.4, < 3.5) + devise (~> 3.5.0) railties rotp (< 2) diff-lcs (1.2.5) @@ -558,6 +559,8 @@ GEM request_store (1.2.0) rerun (0.10.0) listen (~> 2.7, >= 2.7.3) + responders (1.1.2) + railties (>= 3.2, < 4.2) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -806,7 +809,7 @@ DEPENDENCIES d3_rails (~> 3.5.5) database_cleaner (~> 1.4.0) default_value_for (~> 3.0.0) - devise (~> 3.2.4) + devise (~> 3.5.2) devise-async (~> 0.9.0) devise-two-factor (~> 1.0.1) diffy (~> 3.0.3) @@ -928,3 +931,6 @@ DEPENDENCIES webmock (~> 1.21.0) whenever (~> 0.8.4) wikicloth (= 0.8.1) + +BUNDLED WITH + 1.10.6 |