diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-19 17:49:16 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-20 13:25:53 -0500 |
| commit | 3a51383a5725fb1e48a7139fbb6ffed130826a94 (patch) | |
| tree | 68d31a801027540f21b352b92b9bddc97a2f779c | |
| parent | f585255894663138775ef9ec45b8fab0ef13aa52 (diff) | |
| download | gitlab-ce-3a51383a5725fb1e48a7139fbb6ffed130826a94.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
| -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-bitbucket', '~> 0.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index ee0f959cce3..a652a3ac67b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -428,7 +428,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) @@ -899,7 +899,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-azure-oauth2 (~> 0.0.6) omniauth-bitbucket (~> 0.0.2) 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: |