Resolve conflicts from moving move issues button

app/controllers/projects/issues_controller.rb

@@ -284,11 +284,7 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def render_issue_json
     if @issue.valid?
-<<<<<<< HEAD
       render json: IssueSerializer.new.represent(@issue)
-=======
-      render json: serializer.represent(@issue)
->>>>>>> ce-com/master
     else
       render json: { errors: @issue.errors.full_messages }, status: :unprocessable_entity
     end

app/helpers/issuables_helper.rb

@@ -217,13 +217,8 @@ module IssuablesHelper
       canDestroy: can?(current_user, :destroy_issue, issuable),
       issuableRef: issuable.to_reference,
       isConfidential: issuable.confidential,
-<<<<<<< HEAD
-      markdownPreviewUrl: preview_markdown_path(@project),
-      markdownDocs: help_page_path('user/markdown'),
-=======
       markdownPreviewPath: preview_markdown_path(@project),
       markdownDocsPath: help_page_path('user/markdown'),
->>>>>>> ce-com/master
       issuableTemplates: issuable_templates(issuable),
       projectPath: ref_project.path,
       projectNamespace: ref_project.namespace.full_path,

app/views/shared/issuable/_form.html.haml

@@ -29,11 +29,8 @@
 
 = render 'shared/issuable/form/metadata', issuable: issuable, form: form
 
-<<<<<<< HEAD
 = render 'shared/issuable/approvals', issuable: issuable, form: form
 
-=======
->>>>>>> ce-com/master
 = render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form
 
 = render 'shared/issuable/form/merge_params', issuable: issuable

spec/controllers/autocomplete_controller_spec.rb

@@ -331,7 +331,6 @@ describe AutocompleteController do
         it 'returns no projects' do
           expect(json_response).to be_kind_of(Array)
           expect(json_response.size).to eq(0)
-<<<<<<< HEAD
         end
       end
     end
@@ -370,8 +369,6 @@ describe AutocompleteController do
           expect(json_response[1]).to match('name' => 'thumbsup')
           expect(json_response[2]).to match('name' => 'tea')
           expect(json_response[3]).to match('name' => 'thumbsdown')
-=======
->>>>>>> ce-com/master
         end
       end
     end

spec/javascripts/issue_show/components/app_spec.js

@@ -40,13 +40,8 @@ describe('Issuable output', () => {
         initialTitleText: '',
         initialDescriptionHtml: '',
         initialDescriptionText: '',
-<<<<<<< HEAD
-        markdownPreviewUrl: '/',
-        markdownDocs: '/',
-=======
         markdownPreviewPath: '/',
         markdownDocsPath: '/',
->>>>>>> ce-com/master
         isConfidential: false,
         projectNamespace: '/',
         projectPath: '/',

spec/javascripts/issue_show/components/form_spec.js

@@ -17,13 +17,8 @@ describe('Inline edit form component', () => {
           description: 'a',
           lockedWarningVisible: false,
         },
-<<<<<<< HEAD
-        markdownPreviewUrl: '/',
-        markdownDocs: '/',
-=======
         markdownPreviewPath: '/',
         markdownDocsPath: '/',
->>>>>>> ce-com/master
         projectPath: '/',
         projectNamespace: '/',
       },