Resolve simple merge conflicts

.gitlab-ci.yml

@@ -320,29 +320,6 @@ downtime_check:
     - /^[\d-]+-stable(-ee)?$/
     - /(^docs[\/-].*|.*-docs$)/
 
-<<<<<<< HEAD
-=======
-ee_compat_check:
-  <<: *rake-exec
-  only:
-    - branches@gitlab-org/gitlab-ce
-  except:
-    - master
-    - tags
-    - /^[\d-]+-stable(-ee)?$/
-  allow_failure: yes
-  cache:
-    key: "ee_compat_check_repo"
-    paths:
-      - ee_compat_check/ee-repo/
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
-    when: on_failure
-    expire_in: 10d
-    paths:
-      - ee_compat_check/patches/*.patch
-
->>>>>>> ce/master
 # DB migration, rollback, and seed jobs
 .db-migrate-reset: &db-migrate-reset
   stage: test

.rubocop.yml

@@ -971,21 +971,14 @@ RSpec/DescribeSymbol:
 RSpec/DescribedClass:
   Enabled: true
 
-<<<<<<< HEAD
-# Configuration parameters: CustomIncludeMethods.
-=======
 # Checks if an example group does not include any tests.
->>>>>>> ce/master
 RSpec/EmptyExampleGroup:
   Enabled: true
   CustomIncludeMethods:
     - run_permission_checks
-<<<<<<< HEAD
     - run_group_permission_checks
     - it_should_email!
     - it_should_not_email!
-=======
->>>>>>> ce/master
 
 # Checks for long example.
 RSpec/ExampleLength:

CHANGELOG.md

@@ -22,10 +22,7 @@ entry.
 - Display slash commands outcome when previewing Markdown. !10054 (Rares Sfirlogea)
 - Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb". !10244 (dosuken123)
 - Add keyboard edit shotcut for wiki. !10245 (George Andrinopoulos)
-<<<<<<< HEAD
 - Update issue board cards design. !10353
-=======
->>>>>>> ce/master
 - Redirect old links after renaming a user/group/project. !10370
 - Add system note on description change of issue/merge request. !10392 (blackst0ne)
 - Improve validation of namespace & project paths. !10413
@@ -140,10 +137,7 @@ entry.
 - Remove `#` being added on commit sha in MR widget.
 - Remove spinner from loading comment.
 - Fixes an issue preventing screen readers from reading some icons.
-<<<<<<< HEAD
 - Add metrics events for incoming emails.
-=======
->>>>>>> ce/master
 - Load milestone tabs asynchronously to increase initial load performance.
 - [BB Importer] Save the error trace and the whole raw document to debug problems easier.
 - Fixed branches dropdown rendering branch names as HTML.

app/controllers/groups/application_controller.rb

@@ -34,11 +34,7 @@ class Groups::ApplicationController < ApplicationController
 
   def build_canonical_path(group)
     params[:group_id] = group.to_param
-<<<<<<< HEAD
-
-=======
     
->>>>>>> ce/master
     url_for(params)
   end
 end

app/controllers/groups_controller.rb

@@ -179,11 +179,7 @@ class GroupsController < Groups::ApplicationController
 
   def build_canonical_path(group)
     return group_path(group) if action_name == 'show' # root group path
-<<<<<<< HEAD
-
-=======
     
->>>>>>> ce/master
     params[:id] = group.to_param
 
     url_for(params)

app/controllers/projects/merge_requests_controller.rb

@@ -10,14 +10,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   before_action :module_enabled
   before_action :merge_request, only: [
     :edit, :update, :show, :diffs, :commits, :conflicts, :conflict_for_path, :pipelines, :merge,
-<<<<<<< HEAD
     :pipeline_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_pipeline_succeeds,
     :remove_wip, :resolve_conflicts, :assign_related_issues, :commit_change_content,
     # EE
     :approve, :approvals, :unapprove, :rebase
-=======
-    :pipeline_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_pipeline_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues, :commit_change_content
->>>>>>> ce/master
   ]
   before_action :validates_merge_request, only: [:show, :diffs, :commits, :pipelines]
   before_action :define_show_vars, only: [:diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines]

app/helpers/system_note_helper.rb

@@ -18,12 +18,9 @@ module SystemNoteHelper
     'milestone' => 'icon_clock_o',
     'discussion' => 'icon_comment_o',
     'moved' => 'icon_arrow_circle_o_right',
-<<<<<<< HEAD
+    'outdated' => 'icon_edit',
     'approved' => 'icon_check',
-    'unapproved' => 'icon_fa_close'
-=======
-    'outdated' => 'icon_edit'
->>>>>>> ce/master
+    'unapproved' => 'icon_fa_close',
   }.freeze
 
   def icon_for_system_note(note)

app/models/system_note_metadata.rb

@@ -2,11 +2,8 @@ class SystemNoteMetadata < ActiveRecord::Base
   ICON_TYPES = %w[
     commit description merge confidential visible label assignee cross_reference
     title time_tracking branch milestone discussion task moved opened closed merged
-<<<<<<< HEAD
-    approved unapproved
-=======
     outdated
->>>>>>> ce/master
+    approved unapproved
   ].freeze
 
   validates :note, presence: true

doc/README.md

@@ -49,11 +49,8 @@ Shortcuts to GitLab's most visited docs:
 - [Snippets](user/snippets.md): Snippets allow you to create little bits of code.
 - [Wikis](user/project/wiki/index.md): Enhance your repository documentation with built-in wikis.
 - [GitLab Pages](user/project/pages/index.md): Build, test, and deploy your static website with GitLab Pages.
-<<<<<<< HEAD
 - **(EEP)** [GitLab Service Desk](user/project/service_desk.md): A simple way to allow people to create issues in your GitLab instance without needing their own user account.
 - **(EES/EEP)** [Contribution Analytics](analytics/contribution_analytics.md): See detailed statistics of projects' contributors.
-=======
->>>>>>> ce/master
 
 ### Repository
 

doc/ci/README.md

@@ -66,15 +66,10 @@ learn how to leverage its potential even more.
   submodules are involved
 - [Auto deploy](autodeploy/index.md)
 - [Use SSH keys in your build environment](ssh_keys/README.md)
-<<<<<<< HEAD
   and status of each CI environment running on Kubernetes
 - [Trigger pipelines through the GitLab API](triggers/README.md)
 - [Trigger pipelines on a schedule](../user/project/pipelines/schedules.md)
 - [Deploy Boards](../user/project/deploy_boards.md) - Check the current health
-=======
-- [Trigger pipelines through the GitLab API](triggers/README.md)
-- [Trigger pipelines on a schedule](../user/project/pipelines/schedules.md)
->>>>>>> ce/master
 
 ## Review Apps
 

doc/user/project/milestones/index.md

@@ -48,7 +48,14 @@ special options available when filtering by milestone:
   date less than today. Note that this can return results from several
   milestones in the same project.
 
-<<<<<<< HEAD
+## Milestone progress statistics
+
+Milestone statistics can be viewed in the milestone sidebar. The milestone percentage statistic
+is calculated as; closed and merged merge requests plus all closed issues divided by
+total merge requests and issues.
+
+![Milestone statistics](img/progress.png)
+
 ## Burndown charts
 
 >**Notes:**
@@ -77,12 +84,4 @@ cumulative value.
 
 [ee-1540]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1540
 [ee]: https://about.gitlab.com/gitlab-ee
-=======
-## Milestone progress statistics
 
-Milestone statistics can be viewed in the milestone sidebar. The milestone percentage statistic
-is calculated as; closed and merged merge requests plus all closed issues divided by
-total merge requests and issues.
-
-![Milestone statistics](img/progress.png)
->>>>>>> ce/master

lib/gitlab/gon_helper.rb

@@ -12,10 +12,7 @@ module Gitlab
       gon.katex_js_url           = ActionController::Base.helpers.asset_path('katex.js')
       gon.sentry_dsn             = current_application_settings.clientside_sentry_dsn if current_application_settings.clientside_sentry_enabled
       gon.gitlab_url             = Gitlab.config.gitlab.url
-<<<<<<< HEAD
       gon.test                   = Rails.env.test?
-=======
->>>>>>> ce/master
       gon.revision               = Gitlab::REVISION
 
       if current_user

lib/gitlab/usage_data.rb

@@ -44,11 +44,8 @@ module Gitlab
             projects_prometheus_active: PrometheusService.active.count,
             protected_branches: ProtectedBranch.count,
             releases: Release.count,
-<<<<<<< HEAD
             remote_mirrors: RemoteMirror.count,
             services: Service.where(active: true).count,
-=======
->>>>>>> ce/master
             snippets: Snippet.count,
             todos: Todo.count,
             uploads: Upload.count,

scripts/prepare_build.sh

@@ -41,14 +41,11 @@ else # Assume it's mysql
     sed -i 's/username:.*/username: root/g' config/database.yml
     sed -i 's/password:.*/password:/g' config/database.yml
     sed -i 's/# host:.*/host: mysql/g' config/database.yml
-<<<<<<< HEAD
 
     # EE-only
     sed -i 's/username:.*/username: root/g' config/database_geo.yml
     sed -i 's/password:.*/password:/g' config/database_geo.yml
     sed -i 's/# host:.*/host: mysql/g' config/database_geo.yml
-=======
->>>>>>> ce/master
 fi
 
 if [ "$SETUP_DB" != "false" ]; then

spec/support/test_env.rb

@@ -42,12 +42,8 @@ module TestEnv
     'csv'                                => '3dd0896',
     'v1.1.0'                             => 'b83d6e3',
     'add-ipython-files'                  => '6d85bb6',
-<<<<<<< HEAD
     'add-pdf-file'                       => 'e774ebd',
     'squash-large-files'                 => '54cec52'
-=======
-    'add-pdf-file'                       => 'e774ebd'
->>>>>>> ce/master
   }.freeze
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily