diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-19 20:49:16 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-20 21:25:46 +0300 |
| commit | 2e2e6c5ade0f4054daa30877163a3e9bed5860ff (patch) | |
| tree | 650e6a614d0a9da7ba7911f36371230d52bb21cf | |
| parent | b6dfae958704bf878704d997df8712cb47b589bb (diff) | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/upgrade-omniauth.yml | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -19,7 +19,7 @@ gem 'pg', '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.2.0' -gem 'omniauth', '~> 1.3.1' +gem 'omniauth', '~> 1.3.2' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' gem 'omniauth-cas3', '~> 1.1.2' diff --git a/Gemfile.lock b/Gemfile.lock index ce6e0ea3588..cddd3530ae3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -455,7 +455,7 @@ GEM octokit (4.3.0) sawyer (~> 0.7.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) @@ -936,7 +936,7 @@ DEPENDENCIES oauth2 (~> 1.2.0) octokit (~> 4.3.0) 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) diff --git a/changelogs/unreleased/upgrade-omniauth.yml b/changelogs/unreleased/upgrade-omniauth.yml new file mode 100644 index 00000000000..7e0334566dc --- /dev/null +++ b/changelogs/unreleased/upgrade-omniauth.yml @@ -0,0 +1,4 @@ +--- +title: Upgrade omniauth gem to 1.3.2 +merge_request: +author: |