diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-19 11:18:57 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-19 11:18:57 +0100 |
| commit | b4d61ac46babc04f67bb191c477dddc88e10ad45 (patch) | |
| tree | 5c956996de67438678ba59d5e02e3627713b2e2f /Gemfile.lock | |
| parent | 1ede975cde6d32a74b2d4d523e5c0e242c89d50d (diff) | |
| parent | 2becc6fae9b82479b644c0ca10b758cf8447bc19 (diff) | |
| download | gitlab-ce-b4d61ac46babc04f67bb191c477dddc88e10ad45.tar.gz | |
Merge branch 'master' into doc_refactor_commits_apidoc_refactor_commits_api
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f1bba7f437e..a14fdbeed23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,7 +157,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (3.5.3) + devise (3.5.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -614,7 +614,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.0.0) raindrops (0.15.0) - rake (10.4.2) + rake (10.5.0) raphael-rails (2.1.2) rb-fsevent (0.9.6) rb-inotify (0.9.5) @@ -648,8 +648,8 @@ GEM request_store (1.2.1) rerun (0.11.0) listen (~> 3.0) - responders (2.1.0) - railties (>= 4.2.0, < 5) + responders (2.1.1) + railties (>= 4.2.0, < 5.1) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -911,7 +911,7 @@ DEPENDENCIES d3_rails (~> 3.5.0) database_cleaner (~> 1.4.0) default_value_for (~> 3.0.0) - devise (~> 3.5.3) + devise (~> 3.5.4) devise-async (~> 0.9.0) devise-two-factor (~> 2.0.0) diffy (~> 3.0.3) |