Resolve conflicts

app/assets/stylesheets/pages/settings.scss

@@ -184,7 +184,6 @@
   }
 }
 
-<<<<<<< HEAD
 .nested-settings {
   padding-left: 20px;
 }
@@ -210,8 +209,6 @@
   }
 }
 
-=======
->>>>>>> upstream/master
 .prometheus-metrics-monitoring {
   .panel {
     .panel-toggle {

app/helpers/application_settings_helper.rb

@@ -2,11 +2,8 @@ module ApplicationSettingsHelper
   prepend EE::ApplicationSettingsHelper
   extend self
 
-<<<<<<< HEAD
-=======
   include Gitlab::CurrentSettings
 
->>>>>>> upstream/master
   delegate  :gravatar_enabled?,
             :signup_enabled?,
             :password_authentication_enabled?,

app/models/group.rb

@@ -131,19 +131,11 @@ class Group < Namespace
   def visibility_level_allowed_by_projects?(level = self.visibility_level)
     !projects.where('visibility_level > ?', level).exists?
   end
-<<<<<<< HEAD
 
   def visibility_level_allowed_by_sub_groups?(level = self.visibility_level)
     !children.where('visibility_level > ?', level).exists?
   end
 
-=======
-
-  def visibility_level_allowed_by_sub_groups?(level = self.visibility_level)
-    !children.where('visibility_level > ?', level).exists?
-  end
-
->>>>>>> upstream/master
   def visibility_level_allowed?(level = self.visibility_level)
     visibility_level_allowed_by_parent?(level) &&
       visibility_level_allowed_by_projects?(level) &&

app/models/merge_request.rb

@@ -969,13 +969,12 @@ class MergeRequest < ActiveRecord::Base
     true
   end
 
-<<<<<<< HEAD
   def base_pipeline
     @base_pipeline ||= project.pipelines.find_by(sha: merge_request_diff&.base_commit_sha)
-=======
+  end
+
   def update_project_counter_caches?
     state_changed?
->>>>>>> upstream/master
   end
 
   def update_project_counter_caches

app/services/users/build_service.rb

 module Users
   class BuildService < BaseService
-<<<<<<< HEAD
     prepend ::EE::Users::BuildService
-=======
     include Gitlab::CurrentSettings
->>>>>>> upstream/master
 
     def initialize(current_user, params = {})
       @current_user = current_user

doc/user/project/quick_actions.md

@@ -41,10 +41,7 @@ do.
 | `/clear_weight` | Clears the issue weight |
 | `/board_move ~column`      | Move issue to column on the board |
 | `/duplicate #issue`        | Closes this issue and marks it as a duplicate of another issue |
-<<<<<<< HEAD
+| `/move path/to/project`	     | Moves issue to another project |
 
 Note: In GitLab EES every issue can have more than one assignee, so commands `/assign`, `/unassign` and `/reassign`
 support multiple assignees.
-=======
-| `/move path/to/project`	     | Moves issue to another project |
->>>>>>> upstream/master

features/steps/project/redirects.rb

@@ -17,11 +17,7 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
   end
 
   step 'I should see project "Community" home page' do
-<<<<<<< HEAD
-    expect(Gitlab.config.gitlab).to receive(:host).and_return("www.example.com")
-=======
     Gitlab.config.gitlab.should_receive(:host).and_return("www.example.com")
->>>>>>> upstream/master
     page.within '.breadcrumbs .title' do
       expect(page).to have_content 'Community'
     end

lib/api/helpers/runner.rb

 module API
   module Helpers
     module Runner
-<<<<<<< HEAD
       prepend EE::API::Helpers::Runner
-=======
       include Gitlab::CurrentSettings
->>>>>>> upstream/master
 
       JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze
       JOB_TOKEN_PARAM = :token

lib/gitlab/auth.rb

@@ -19,11 +19,8 @@ module Gitlab
     OPTIONAL_SCOPES = (AVAILABLE_SCOPES + OPENID_SCOPES - DEFAULT_SCOPES).freeze
 
     class << self
-<<<<<<< HEAD
       prepend EE::Gitlab::Auth
-=======
       include Gitlab::CurrentSettings
->>>>>>> upstream/master
 
       def find_for_git_client(login, password, project:, ip:)
         raise "Must provide an IP for rate limiting" if ip.nil?

package.json

@@ -20,11 +20,8 @@
     "babel-preset-latest": "^6.24.0",
     "babel-preset-stage-2": "^6.22.0",
     "bootstrap-sass": "^3.3.6",
-<<<<<<< HEAD
     "clipboard": "^1.6.1",
-=======
     "brace-expansion": "^1.1.8",
->>>>>>> upstream/master
     "compression-webpack-plugin": "^1.0.0",
     "copy-webpack-plugin": "^4.0.1",
     "core-js": "^2.4.1",

spec/services/quick_actions/interpret_service_spec.rb

@@ -1224,7 +1224,6 @@ describe QuickActions::InterpretService do
       end
     end
 
-<<<<<<< HEAD
     # EE-specific tests
 
     describe 'weight command' do
@@ -1233,7 +1232,9 @@ describe QuickActions::InterpretService do
       it 'includes the number' do
         _, explanations = service.explain(content, issue)
         expect(explanations).to eq(['Sets weight to 4.'])
-=======
+      end
+    end
+
     describe 'move issue to another project command' do
       let(:content) { '/move test/project' }
 
@@ -1241,7 +1242,6 @@ describe QuickActions::InterpretService do
         _, explanations = service.explain(content, issue)
 
         expect(explanations).to eq(["Moves this issue to test/project."])
->>>>>>> upstream/master
       end
     end
   end