diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-01 17:00:27 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-01 17:00:27 +0000 |
| commit | 1cb3b9b29cd7a3e086b204f06971ffd562cb6330 (patch) | |
| tree | fcbdbc9bc027c1c299248f233163b6da5fa0902e | |
| parent | abe98d44e8902a3f721c0f17cc20dc55bcb2d2f6 (diff) | |
| parent | c4ec11d7211f9660661746076f19d95de0918269 (diff) | |
| download | gitlab-ce-1cb3b9b29cd7a3e086b204f06971ffd562cb6330.tar.gz | |
Merge branch 'sh-bump-omniauth-gitlab' into 'master'
Bump omniauth-gitlab to 1.0.3
See merge request gitlab-org/gitlab-ce!19319
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-omniauth-gitlab.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4d2bd62bec0..2efd89bf40d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -540,7 +540,7 @@ GEM omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-gitlab (1.0.2) + omniauth-gitlab (1.0.3) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.5.3) diff --git a/changelogs/unreleased/sh-bump-omniauth-gitlab.yml b/changelogs/unreleased/sh-bump-omniauth-gitlab.yml new file mode 100644 index 00000000000..145fdf72020 --- /dev/null +++ b/changelogs/unreleased/sh-bump-omniauth-gitlab.yml @@ -0,0 +1,5 @@ +--- +title: Bump omniauth-gitlab to 1.0.3 +merge_request: +author: +type: changed |