diff options
author | Rémy Coutable <remy@rymai.me> | 2018-05-03 19:44:41 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-05-03 19:44:41 +0300 |
commit | 969f3a9a789dccfc8e46255fdd01ee2a05a4dabf (patch) | |
tree | ac637d35e9347fcb3487dd3727af3b3d5f50182b | |
parent | 7ff891e5ec21bc392abeab7d5049df49596d53a6 (diff) | |
parent | 351a79369376663a6dd3e43bec31597d8544f9d7 (diff) |
Merge branch 'update-omniauth-github' into 'master'
update omniauth-github ~> 1.1.1 to ~> 1.3
See merge request gitlab-org/gitlab-ce!18668
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -41,7 +41,7 @@ gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '~> 1.1.1' +gem 'omniauth-github', '~> 1.3' gem 'omniauth-gitlab', '~> 1.0.2' gem 'omniauth-google-oauth2', '~> 0.5.3' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos diff --git a/Gemfile.lock b/Gemfile.lock index 87ee15e9e76..7fd49417c71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -546,9 +546,9 @@ GEM omniauth (~> 1.2) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) + omniauth-github (1.3.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) @@ -1114,7 +1114,7 @@ DEPENDENCIES omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) omniauth-facebook (~> 4.0.0) - omniauth-github (~> 1.1.1) + omniauth-github (~> 1.3) omniauth-gitlab (~> 1.0.2) omniauth-google-oauth2 (~> 0.5.3) omniauth-kerberos (~> 0.3.0) |