diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-08 10:48:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-11-08 10:48:38 +0000 |
| commit | e671cd89956874e05812032400ba2910581f7de1 (patch) | |
| tree | 2ec965d47c23d12022912bfb5c9e98eb05ee6875 | |
| parent | 9c3f3e9e359740b10edafaa1b06b0ff3e2070820 (diff) | |
| parent | 38909dac1d8b5ded2dd94f5eddc21206934d2231 (diff) | |
| download | gitlab-ce-e671cd89956874e05812032400ba2910581f7de1.tar.gz | |
Merge branch 'sh-bump-omniauth-gitlab' into 'master'
Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2
As noted in gitlab-com/support-forum#1270, omniauth-gitlab fails if omniauth-oauth2 is bumped to 1.4.0, OAuth2 quietly fails due to https://github.com/linchus/omniauth-gitlab/issues/10:
```
21:26:04 rails-web.1 | I, [2016-11-07T21:26:04.245007 #56637] INFO -- omniauth: (gitlab) Callback phase initiated.
21:26:05 rails-web.1 | E, [2016-11-07T21:26:05.068009 #56637] ERROR -- omniauth: (gitlab) Authentication failure! invalid_credentials: OAuth2::Error, invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
```
This was fixed and discussed here:
* https://github.com/linchus/omniauth-gitlab/commit/26c47e55396205fab8439363c98136d0fde797f3
* https://github.com/linchus/omniauth-gitlab/issues/10
Bumping this version to 1.0.2 will ensure future compatibility.
See merge request !7348
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-omniauth-gitlab.yml | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -26,7 +26,7 @@ gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' -gem 'omniauth-gitlab', '~> 1.0.0' +gem 'omniauth-gitlab', '~> 1.0.2' gem 'omniauth-google-oauth2', '~> 0.4.1' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-saml', '~> 1.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index 165b25c170e..290e4c3e1b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -456,7 +456,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.1) + omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.4.1) @@ -913,7 +913,7 @@ DEPENDENCIES omniauth-cas3 (~> 1.1.2) omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) + omniauth-gitlab (~> 1.0.2) omniauth-google-oauth2 (~> 0.4.1) omniauth-kerberos (~> 0.3.0) omniauth-saml (~> 1.7.0) diff --git a/changelogs/unreleased/sh-bump-omniauth-gitlab.yml b/changelogs/unreleased/sh-bump-omniauth-gitlab.yml new file mode 100644 index 00000000000..17cd5a993dd --- /dev/null +++ b/changelogs/unreleased/sh-bump-omniauth-gitlab.yml @@ -0,0 +1,4 @@ +--- +title: Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2 +merge_request: +author: |