Fix merge conflicts

.gitlab-ci.yml

@@ -15,15 +15,10 @@ variables:
   GIT_DEPTH: "20"
   PHANTOMJS_VERSION: "2.1.1"
   GET_SOURCES_ATTEMPTS: "3"
-<<<<<<< HEAD
-  KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-${CI_COMMIT_REF_SLUG}.json
-  KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-${CI_COMMIT_REF_SLUG}.json
-  # This hack is needed to make ES not that memory hungry
-  ES_JAVA_OPTS: "-Xms600m -Xmx600m"
-=======
   KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
   KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json
->>>>>>> ce/master
+  # This hack is needed to make ES not that memory hungry
+  ES_JAVA_OPTS: "-Xms600m -Xmx600m"
 
 before_script:
   - source ./scripts/prepare_build.sh

VERSION

-<<<<<<< HEAD
-8.18.0-ee-pre
-=======
-9.1.0-pre
->>>>>>> ce/master
+9.1.0-ee-pre

app/assets/javascripts/dispatcher.js

@@ -34,11 +34,8 @@
 /* global Labels */
 /* global Shortcuts */
 /* global Sidebar */
-<<<<<<< HEAD
 /* global WeightSelect */
 /* global AdminEmailSelect */
-=======
->>>>>>> ce/master
 
 import Issue from './issue';
 

app/assets/stylesheets/pages/boards.scss

@@ -330,7 +330,6 @@
   }
 }
 
-<<<<<<< HEAD
 .boards-title-holder {
   padding: 25px 13px $gl-padding;
 
@@ -351,10 +350,7 @@
   border-top: 1px solid $border-color;
 }
 
-.issue-boards-sidebar {
-=======
 .page-with-layout-nav.page-with-sub-nav .issue-boards-sidebar {
->>>>>>> ce/master
   &.right-sidebar {
     top: 0;
     bottom: 0;

app/assets/stylesheets/pages/projects.scss

@@ -742,7 +742,6 @@ pre.light-well {
   }
 }
 
-<<<<<<< HEAD
 a.allowed-to-merge,
 a.allowed-to-push {
   cursor: pointer;
@@ -756,8 +755,6 @@ a.allowed-to-push {
   }
 }
 
-=======
->>>>>>> ce/master
 .create-new-protected-branch-button {
   @include dropdown-link;
 

app/models/system_note_metadata.rb

 class SystemNoteMetadata < ActiveRecord::Base
   ICON_TYPES = %w[
     commit merge confidentiality status label assignee cross_reference
-<<<<<<< HEAD
     title time_tracking branch milestone discussion task moved approvals
-=======
-    title time_tracking branch milestone discussion task moved
->>>>>>> ce/master
   ].freeze
 
   validates :note, presence: true

app/services/system_note_service.rb

@@ -467,7 +467,6 @@ module SystemNoteService
     body = "moved #{direction} #{cross_reference}"
 
     create_note(NoteSummary.new(noteable, project, author, body, action: 'moved'))
-<<<<<<< HEAD
   end
 
   # Called when the merge request is approved by user
@@ -490,8 +489,6 @@ module SystemNoteService
     body = "unapproved this merge request"
 
     create_note(NoteSummary.new(noteable, noteable.project, user, body, action: 'approvals'))
-=======
->>>>>>> ce/master
   end
 
   private

app/views/projects/merge_requests/widget/open/_accept.html.haml

@@ -45,11 +45,10 @@
             = link_to icon('question-circle'), help_page_path('user/project/merge_requests/squash_and_merge'), title: 'About this feature', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'}
 
       .accept-control
-<<<<<<< HEAD
         - if @project.merge_requests_ff_only_enabled
           Fast-forward merge without a merge commit
         - else
-          = link_to "#", class: "modify-merge-commit-link js-toggle-button" do
+          %button.modify-merge-commit-link.js-toggle-button{ type: "button" }
             = icon('edit')
             Modify commit message
     - unless @project.merge_requests_ff_only_enabled
@@ -59,16 +58,5 @@
             message_without_description: @merge_request.merge_commit_message,
             text: @merge_request.merge_commit_message,
             rows: 14, hint: true
-=======
-        %button.modify-merge-commit-link.js-toggle-button{ type: "button" }
-          = icon('edit')
-          Modify commit message
-    .js-toggle-content.hide.prepend-top-default
-      = render 'shared/commit_message_container', params: params,
-          message_with_description: @merge_request.merge_commit_message(include_description: true),
-          message_without_description: @merge_request.merge_commit_message,
-          text: @merge_request.merge_commit_message,
-          rows: 14, hint: true
->>>>>>> ce/master
 
     = hidden_field_tag :merge_when_pipeline_succeeds, "", autocomplete: "off"

app/views/search/_category.html.haml

@@ -72,17 +72,14 @@
           Milestones
           %span.badge
             = @search_results.milestones_count
-<<<<<<< HEAD
       - if current_application_settings.elasticsearch_search?
-        %li{ class: ("active" if @scope == 'blobs') }
+        %li{ class: active_when(@scope == 'blobs') }
           = link_to search_filter_path(scope: 'blobs') do
             Code
             %span.badge
               = @search_results.blobs_count
-        %li{ class: ("active" if @scope == 'commits') }
+        %li{ class: active_when(@scope == 'commits') }
           = link_to search_filter_path(scope: 'commits') do
             Commits
             %span.badge
               = @search_results.commits_count
-=======
->>>>>>> ce/master

app/views/shared/milestones/_sidebar.html.haml

@@ -85,7 +85,6 @@
               Closed:
               = milestone.issues_visible_to_user(current_user).closed.count
 
-<<<<<<< HEAD
     - total_weight = milestone.issues_visible_to_user(current_user).sum(:weight)
     .block.weight
       .sidebar-collapsed-icon
@@ -103,8 +102,6 @@
         - else
           .no-value None
 
-=======
->>>>>>> ce/master
     .block
       .sidebar-collapsed-icon
         %strong

changelogs/unreleased/24784-system-notes-meta-data.yml

 ---
 title: Add metadata to system notes
-<<<<<<< HEAD
-merge_request: 1526
-=======
 merge_request: 9964
->>>>>>> ce/master
 author:

config/initializers/0_inflections.rb

@@ -10,10 +10,6 @@
 # end
 #
 ActiveSupport::Inflector.inflections do |inflect|
-<<<<<<< HEAD
   inflect.uncountable %w(award_emoji project_statistics project_registry file_registry system_note_metadata)
   inflect.acronym 'EE'
-=======
-  inflect.uncountable %w(award_emoji project_statistics system_note_metadata)
->>>>>>> ce/master
 end

config/webpack.config.js

@@ -108,12 +108,9 @@ var config = {
         'environments_folder',
         'issuable',
         'merge_conflicts',
-<<<<<<< HEAD
-        'mr_widget_ee',
-=======
         'notebook_viewer',
->>>>>>> ce/master
         'vue_pipelines',
+        'mr_widget_ee',
       ],
       minChunks: function(module, count) {
         return module.resource && (/vue_shared/).test(module.resource);

doc/README.md

-<<<<<<< HEAD
-# GitLab Enterprise Edition documentation
-=======
-# GitLab Community Edition
->>>>>>> ce/master
+# GitLab Enterprise Edition
 
 All technical content published by GitLab lives in the documentation, including:
 

lib/api/merge_requests.rb

@@ -233,7 +233,6 @@ module API
           .cancel(merge_request)
       end
 
-<<<<<<< HEAD
       desc 'List issues that will be closed on merge' do
         success Entities::MRNote
       end
@@ -291,20 +290,6 @@ module API
 
         present merge_request, with: Entities::MergeRequestApprovals, current_user: current_user
       end
-
-=======
->>>>>>> ce/master
-      desc 'List issues that will be closed on merge' do
-        success Entities::MRNote
-      end
-      params do
-        use :pagination
-      end
-      get ':id/merge_requests/:merge_request_iid/closes_issues' do
-        merge_request = find_merge_request_with_access(params[:merge_request_iid])
-        issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user))
-        present paginate(issues), with: issue_entity(user_project), current_user: current_user
-      end
     end
   end
 end

spec/models/namespace_spec.rb

@@ -188,7 +188,6 @@ describe Namespace, models: true do
     end
   end
 
-<<<<<<< HEAD
   describe '#actual_size_limit' do
     let(:namespace) { build(:namespace) }
 
@@ -201,10 +200,6 @@ describe Namespace, models: true do
     end
   end
 
-  describe '#rm_dir', 'callback' do
-    let!(:project) { create(:empty_project, namespace: namespace) }
-    let!(:path) { File.join(Gitlab.config.repositories.storages.default['path'], namespace.full_path) }
-=======
   describe '#rm_dir', 'callback', repository: true do
     let!(:project) { create(:project_empty_repo, namespace: namespace) }
     let(:repository_storage_path) { Gitlab.config.repositories.storages.default['path'] }
@@ -214,7 +209,6 @@ describe Namespace, models: true do
 
     it 'renames its dirs when deleted' do
       allow(GitlabShellWorker).to receive(:perform_in)
->>>>>>> ce/master
 
       namespace.destroy
 

spec/services/system_note_service_spec.rb

@@ -331,10 +331,7 @@ describe SystemNoteService, services: true do
     subject { described_class.change_branch_presence(noteable, project, author, :source, 'feature', :delete) }
 
     let(:project) { create(:project, :repository) }
-<<<<<<< HEAD
-=======
 
->>>>>>> ce/master
     it_behaves_like 'a system note' do
       let(:action) { 'branch' }
     end