CE->EE: Resolve view conflicts

app/views/groups/issues.html.haml

@@ -7,10 +7,7 @@
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
   = webpack_bundle_tag 'filtered_search'
-<<<<<<< HEAD
   = webpack_bundle_tag 'issues'
-=======
->>>>>>> ce/master
 
 - if show_new_nav? && group_issues_exists
   - content_for :breadcrumbs_extra do

app/views/layouts/nav/_new_admin_sidebar.html.haml

@@ -109,7 +109,6 @@
         %span.nav-item-name
           Abuse Reports
         %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
-<<<<<<< HEAD
 
     = nav_link(controller: :licenses) do
       = link_to admin_license_path, title: 'License' do
@@ -117,8 +116,6 @@
           = custom_icon('license')
         %span
           License
-=======
->>>>>>> ce/master
 
     - if akismet_enabled?
       = nav_link(controller: :spam_logs) do

app/views/layouts/nav/_new_project_sidebar.html.haml

@@ -95,7 +95,6 @@
             = link_to project_issues_path(@project), title: 'Issues' do
               %span
                 List
-<<<<<<< HEAD
 
             = nav_link(controller: :boards) do
               = link_to project_boards_path(@project), title: 'Boards' do
@@ -105,8 +104,6 @@
             = link_to project_issues_path(@project), title: 'Issues' do
               %span
                 List
-=======
->>>>>>> ce/master
 
           = nav_link(controller: :boards) do
             = link_to project_boards_path(@project), title: 'Board' do

app/views/projects/commits/show.html.haml

@@ -30,21 +30,14 @@
               = link_to _("Create merge request"), create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success'
 
           .control
-<<<<<<< HEAD
-            = form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form') do
-=======
             = form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form', data: { 'signatures-path' => namespace_project_signatures_path }) do
->>>>>>> ce/master
               = search_field_tag :search, params[:search], { placeholder: _('Filter by commit message'), id: 'commits-search', class: 'form-control search-text-input input-short', spellcheck: false }
           .control
             = link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn' do
               = icon("rss")
 
-<<<<<<< HEAD
     = render 'projects/commits/mirror_status'
 
-=======
->>>>>>> ce/master
     %div{ id: dom_id(@project) }
       %ol#commits-list.list-unstyled.content_list
         = render 'commits', project: @project, ref: @ref

app/views/projects/tree/_tree_content.html.haml

-<<<<<<< HEAD
 .tree-content-holder.js-tree-content{ 'data-logs-path': @logs_path, 'data-path-locks-available': (@project.feature_available?(:file_locks) ? 'true' : 'false'), 'data-path-locks-toggle': toggle_project_path_locks_path(@project), 'data-path-locks-path': @path }
-=======
-.tree-content-holder.js-tree-content{ 'data-logs-path': @logs_path }
->>>>>>> ce/master
   .table-holder
     %table.table#tree-slider{ class: "table_#{@hex_path} tree-table" }
       %thead

app/views/shared/_clone_panel.html.haml

@@ -23,10 +23,7 @@
   = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true, aria: { label: 'Project clone URL' }
   .input-group-btn
     = clipboard_button(target: '#project_clone', title: _("Copy URL to clipboard"), class: "btn-default btn-clipboard")
-<<<<<<< HEAD
 
     = geo_button(modal_target: '#modal-geo-info') if Gitlab::Geo.secondary?
 
 = render 'shared/geo_info_modal', project: project if Gitlab::Geo.secondary?
-=======
->>>>>>> ce/master