diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-19 17:49:16 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-22 12:06:33 -0500 |
| commit | b6cd58784303328c3a785a0d458642a708d7260a (patch) | |
| tree | ed866baba441ad893647478e1da8fbd4860747c4 /Gemfile.lock | |
| parent | 217411f3816d3e5092cdb6edaadb0987b061e564 (diff) | |
| download | gitlab-ce-b6cd58784303328c3a785a0d458642a708d7260a.tar.gz | |
Merge branch 'upgrade-omniauth' into 'security'
Upgrade OmniAuth Ruby gem to 1.3.2
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26813
See merge request !2056
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 104e6444803..c9115982838 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -449,7 +449,7 @@ GEM octokit (4.6.2) sawyer (~> 0.8.0, >= 0.5.3) oj (2.17.4) - omniauth (1.3.1) + omniauth (1.3.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) omniauth-auth0 (1.4.1) @@ -925,7 +925,7 @@ DEPENDENCIES oauth2 (~> 1.2.0) octokit (~> 4.6.2) oj (~> 2.17.4) - omniauth (~> 1.3.1) + omniauth (~> 1.3.2) omniauth-auth0 (~> 1.4.1) omniauth-authentiq (~> 0.2.0) omniauth-azure-oauth2 (~> 0.0.6) |