Resolve conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

.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

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/views/projects/merge_requests/widget/open/_accept.html.haml

@@ -45,13 +45,13 @@
             = 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
       .js-toggle-content.hide.prepend-top-default
         = render 'shared/commit_message_container', params: params,
@@ -59,16 +59,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"

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);

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
@@ -292,8 +291,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