diff options
| author | James Lopez <james@gitlab.com> | 2018-03-22 11:04:03 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2018-03-22 11:04:03 +0000 |
| commit | 2eab1fd2c9a7db1f9cc71a706c5ac0cfdc61c953 (patch) | |
| tree | 1ed85940487b28510f4038923febac6f5ee453c6 /Gemfile.lock | |
| parent | 4d0ec5b1284e45f9b927d354d6408cf174ad243b (diff) | |
| parent | d68ddc8366dec3a9aed357c96446a43d36e5de43 (diff) | |
| download | gitlab-ce-2eab1fd2c9a7db1f9cc71a706c5ac0cfdc61c953.tar.gz | |
Merge branch 'master' into 'latest-security-to-master-21-03-18'
# Conflicts:
# Gemfile
# Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e210a522028..aed9f1d6b30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -524,8 +524,8 @@ GEM rack (>= 1.2, < 3) octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.4.3) - hashie (>= 1.2, < 4) + omniauth (1.8.1) + hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) @@ -1104,7 +1104,7 @@ DEPENDENCIES nokogiri (~> 1.8.2) oauth2 (~> 1.4) octokit (~> 4.8) - omniauth (~> 1.4.2) + omniauth (~> 1.8) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.1) omniauth-azure-oauth2 (~> 0.0.9) |