diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-03-13 13:09:37 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-03-13 13:09:37 -0500 |
| commit | 736b4ecf8efa034d95923e8741fb0e31b0d15bfe (patch) | |
| tree | 96ed63e408c2ac24cc704a6b5a48b3497ed01f16 /lib/google_api/auth.rb | |
| parent | 2e5de941392c8463a5e15e9f8cb3a3ab147b656d (diff) | |
| parent | 8f73ddd896dad7bd66d9c96dafcc4311ce272447 (diff) | |
| download | gitlab-ce-add-csslab.tar.gz | |
Merge branch 'master' into add-csslabadd-csslab
Diffstat (limited to 'lib/google_api/auth.rb')
| -rw-r--r-- | lib/google_api/auth.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/google_api/auth.rb b/lib/google_api/auth.rb index 99a82c849e0..1aeaa387a49 100644 --- a/lib/google_api/auth.rb +++ b/lib/google_api/auth.rb @@ -32,7 +32,7 @@ module GoogleApi private def config - Gitlab.config.omniauth.providers.find { |provider| provider.name == "google_oauth2" } + Gitlab::Auth::OAuth::Provider.config_for('google_oauth2') end def client |