diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 00:10:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 00:10:21 +0300 |
| commit | 0ae8428c8e77d5d7e098827be688b1f146321af1 (patch) | |
| tree | cfc80aac796be0dd42ce32a1bd79c8327071993d /app/controllers/omniauth_callbacks_controller.rb | |
| parent | f020d5dc9bf42fe27b1451af34e7ab3a0c38d344 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index af502c083d7..31f404a9974 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -289,4 +289,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController end end -OmniauthCallbacksController.prepend_if_ee('EE::OmniauthCallbacksController') +OmniauthCallbacksController.prepend_mod_with('OmniauthCallbacksController') |