diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 12:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 12:09:34 +0300 |
| commit | 0f59ad0c29c8679957c716317c842f606177f223 (patch) | |
| tree | 387d1f932ad462e2906c840160e0305671acc274 /lib/gitlab/omniauth_initializer.rb | |
| parent | 99454db49e04656e8df692c5a1c4582fec50eee3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/omniauth_initializer.rb')
| -rw-r--r-- | lib/gitlab/omniauth_initializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/omniauth_initializer.rb b/lib/gitlab/omniauth_initializer.rb index c051a581837..4a7a7709c79 100644 --- a/lib/gitlab/omniauth_initializer.rb +++ b/lib/gitlab/omniauth_initializer.rb @@ -2,8 +2,6 @@ module Gitlab class OmniauthInitializer - prepend_if_ee('::EE::Gitlab::OmniauthInitializer') # rubocop: disable Cop/InjectEnterpriseEditionModule - def initialize(devise_config) @devise_config = devise_config end @@ -121,3 +119,5 @@ module Gitlab end end end + +Gitlab::OmniauthInitializer.prepend_if_ee('::EE::Gitlab::OmniauthInitializer') |