diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-05-03 14:23:56 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-05-03 14:23:56 +0300 |
commit | d37d2c32360c2d07aa340b6fae60942446e837ab (patch) | |
tree | e175f29382ebdabe65148ac031699d8f9ee1e2de | |
parent | 1c7bab11a021d376f5e1788194e6f9be569b0bc6 (diff) | |
parent | e72f2b029469fd824ad57b437b267dc2c40b2fc9 (diff) |
Merge branch 'update-devise' into 'master'
update devise 4.2 -> 4.4
See merge request gitlab-org/gitlab-ce!18667
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 19 |
2 files changed, 11 insertions, 10 deletions
@@ -33,7 +33,7 @@ gem 'grape-route-helpers', '~> 2.1.0' gem 'faraday', '~> 0.12' # Authentication libraries -gem 'devise', '~> 4.2' +gem 'devise', '~> 4.4' gem 'doorkeeper', '~> 4.3' gem 'doorkeeper-openid_connect', '~> 1.3' gem 'omniauth', '~> 1.8' diff --git a/Gemfile.lock b/Gemfile.lock index f11df6a283e..87ee15e9e76 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,7 @@ GEM connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.3) + crass (1.0.4) creole (0.5.0) css_parser (1.5.0) addressable @@ -162,10 +162,10 @@ GEM descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) - devise (4.2.0) + devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0, < 6.0) responders warden (~> 1.2.3) devise-two-factor (3.0.0) @@ -646,7 +646,7 @@ GEM pry (>= 0.9.10) public_suffix (3.0.2) pyu-ruby-sasl (0.0.3.3) - rack (1.6.9) + rack (1.6.10) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) @@ -694,7 +694,7 @@ GEM rainbow (2.2.2) rake raindrops (0.18.0) - rake (12.3.0) + rake (12.3.1) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -735,8 +735,9 @@ GEM declarative-option (< 0.2.0) uber (< 0.2.0) request_store (1.3.1) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) @@ -966,7 +967,7 @@ GEM descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) vmstat (2.3.0) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) webmock (2.3.2) addressable (>= 2.3.6) @@ -1028,7 +1029,7 @@ DEPENDENCIES deckar01-task_list (= 2.0.0) default_value_for (~> 3.0.0) device_detector - devise (~> 4.2) + devise (~> 4.4) devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) doorkeeper (~> 4.3) |