Resolve lib/gitlab/auth.rb and lib/gitlab/omniauth_initializer.rb

eea639e1 · Lin Jen-Shin · 89af5308 · eea639e1 · eea639e1
Commit eea639e1 authored Jul 23, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

lib/gitlab/auth.rb lib/gitlab/auth.rb +0 -3

lib/gitlab/omniauth_initializer.rb lib/gitlab/omniauth_initializer.rb +0 -3

No files found.
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -14,11 +14,8 @@ module Gitlab
    DEFAULT_SCOPES = [:api].freeze
    class << self
-<<<<<<< HEAD
      prepend EE::Gitlab::Auth
-=======
->>>>>>> upstream/master
      def omniauth_enabled?
        Gitlab.config.omniauth.enabled
      end

--- a/lib/gitlab/omniauth_initializer.rb
+++ b/lib/gitlab/omniauth_initializer.rb
 module Gitlab
  class OmniauthInitializer
-<<<<<<< HEAD
    prepend ::EE::Gitlab::OmniauthInitializer
-=======
->>>>>>> upstream/master
    def initialize(devise_config)
      @devise_config = devise_config
    end