Commit cad73304 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Resolve prepend related conflicts

parent 8f9cf685
...@@ -123,15 +123,11 @@ class ApplicationController < ActionController::Base ...@@ -123,15 +123,11 @@ class ApplicationController < ActionController::Base
end end
def after_sign_out_path_for(resource) def after_sign_out_path_for(resource)
<<<<<<< HEAD
if Gitlab::Geo.secondary? if Gitlab::Geo.secondary?
Gitlab::Geo.primary_node.oauth_logout_url(@geo_logout_state) Gitlab::Geo.primary_node.oauth_logout_url(@geo_logout_state)
else else
Gitlab::CurrentSettings.after_sign_out_path.presence || new_user_session_path Gitlab::CurrentSettings.after_sign_out_path.presence || new_user_session_path
end end
=======
Gitlab::CurrentSettings.after_sign_out_path.presence || new_user_session_path
>>>>>>> upstream/master
end end
def can?(object, action, subject = :global) def can?(object, action, subject = :global)
......
module ProjectsHelper module ProjectsHelper
<<<<<<< HEAD
prepend ::EE::ProjectsHelper prepend ::EE::ProjectsHelper
=======
>>>>>>> upstream/master
def link_to_project(project) def link_to_project(project)
link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do
title = content_tag(:span, project.name, class: 'project-name') title = content_tag(:span, project.name, class: 'project-name')
......
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
# A note of this type is never resolvable. # A note of this type is never resolvable.
class Note < ActiveRecord::Base class Note < ActiveRecord::Base
extend ActiveModel::Naming extend ActiveModel::Naming
<<<<<<< HEAD
prepend EE::Note prepend EE::Note
=======
>>>>>>> upstream/master
include Participable include Participable
include Mentionable include Mentionable
include Elastic::NotesSearch include Elastic::NotesSearch
......
class ProtectedBranch < ActiveRecord::Base class ProtectedBranch < ActiveRecord::Base
include Gitlab::ShellAdapter include Gitlab::ShellAdapter
include ProtectedRef include ProtectedRef
<<<<<<< HEAD
prepend EE::ProtectedRef prepend EE::ProtectedRef
=======
>>>>>>> upstream/master
protected_ref_access_levels :merge, :push protected_ref_access_levels :merge, :push
......
...@@ -2,11 +2,8 @@ module Ci ...@@ -2,11 +2,8 @@ module Ci
# This class responsible for assigning # This class responsible for assigning
# proper pending build to runner on runner API request # proper pending build to runner on runner API request
class RegisterJobService class RegisterJobService
<<<<<<< HEAD
prepend EE::Ci::RegisterJobService prepend EE::Ci::RegisterJobService
=======
>>>>>>> upstream/master
attr_reader :runner attr_reader :runner
Result = Struct.new(:build, :valid?) Result = Struct.new(:build, :valid?)
......
module Users module Users
class BuildService < BaseService class BuildService < BaseService
<<<<<<< HEAD
prepend ::EE::Users::BuildService prepend ::EE::Users::BuildService
=======
>>>>>>> upstream/master
def initialize(current_user, params = {}) def initialize(current_user, params = {})
@current_user = current_user @current_user = current_user
@params = params.dup @params = params.dup
......
module API module API
module Helpers module Helpers
module Runner module Runner
<<<<<<< HEAD
prepend EE::API::Helpers::Runner prepend EE::API::Helpers::Runner
=======
>>>>>>> upstream/master
JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze
JOB_TOKEN_PARAM = :token JOB_TOKEN_PARAM = :token
UPDATE_RUNNER_EVERY = 10 * 60 UPDATE_RUNNER_EVERY = 10 * 60
......
...@@ -14,11 +14,8 @@ module Gitlab ...@@ -14,11 +14,8 @@ module Gitlab
DEFAULT_SCOPES = [:api].freeze DEFAULT_SCOPES = [:api].freeze
class << self class << self
<<<<<<< HEAD
prepend EE::Gitlab::Auth prepend EE::Gitlab::Auth
=======
>>>>>>> upstream/master
def find_for_git_client(login, password, project:, ip:) def find_for_git_client(login, password, project:, ip:)
raise "Must provide an IP for rate limiting" if ip.nil? raise "Must provide an IP for rate limiting" if ip.nil?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment