Fix conflicts in view files

app/views/admin/dashboard/index.html.haml

@@ -72,7 +72,7 @@
               = reply_email
               %span.light.pull-right
                 = boolean_to_icon Gitlab::IncomingEmail.enabled?
-<<<<<<< HEAD
+
             - elastic = "Elasticsearch"
             %p{ "aria-label" => "#{elastic}: status " + (current_application_settings.elasticsearch_search? ? "on" : "off") }
               = elastic
@@ -83,8 +83,7 @@
               = geo
               %span.light.pull-right
                 = boolean_to_icon Gitlab::Geo.enabled?
-=======
->>>>>>> ce/master
+
             - container_reg = "Container Registry"
             %p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") }
               = container_reg
@@ -126,7 +125,7 @@
               GitLab API
               %span.pull-right
                 = API::API::version
-<<<<<<< HEAD
+
             - if Gitlab::Geo.enabled?
               %p
                 Geo
@@ -135,8 +134,7 @@
                     = Gitlab::Geo.current_node.primary ? 'Primary node' : 'Secondary node'
                   - else
                     Undefined
-=======
->>>>>>> ce/master
+
             %p
               Git
               %span.pull-right

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

@@ -11,11 +11,7 @@
           Project
 
     - if project_nav_tab? :files
-<<<<<<< HEAD
       = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare projects/repositories tags branches releases graphs network path_locks)) do
-=======
-      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare projects/repositories tags branches releases graphs network)) do
->>>>>>> ce/master
         = link_to project_tree_path(@project), title: 'Repository',  class: 'shortcuts-tree' do
           %span
             Repository

app/views/layouts/project.html.haml

@@ -12,10 +12,7 @@
   - if current_user
     :javascript
       window.uploads_path = "#{project_uploads_path(project)}";
-<<<<<<< HEAD
       window.preview_markdown_path = "#{preview_markdown_path(project)}";
-=======
->>>>>>> ce/master
 
 - content_for :header_content do
   .js-dropdown-menu-projects

app/views/projects/artifacts/_tree_file.html.haml

-<<<<<<< HEAD
 - path_to_file = file_project_job_artifacts_path(@project, @build, path: file.path) if @build.downloadable_single_artifacts_file?
-=======
-- path_to_file = file_project_job_artifacts_path(@project, @build, path: file.path)
->>>>>>> ce/master
 
 %tr.tree-item{ 'data-link' => path_to_file }
   - blob = file.blob

app/views/projects/boards/components/sidebar/_assignee.html.haml

@@ -19,18 +19,10 @@
         ":data-name" => "assignee.name",
         ":data-username" => "assignee.username" }
       .dropdown
-<<<<<<< HEAD
         %button.dropdown-menu-toggle.js-user-search.js-author-search.js-multiselect.js-save-user-data.js-issue-board-sidebar{ type: "button", ref: "assigneeDropdown", data: { toggle: "dropdown", field_name: "issue[assignee_ids][]", first_user: (current_user.username if current_user), current_user: "true", project_id: @project.id, null_user: "true", multi_select: "true", dropdown: { header: 'Assignee(s)'} },
           ":data-issuable-id" => "issue.id",
           ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
           Select assignee(s)
-=======
-        - dropdown_options = issue_assignees_dropdown_options
-        %button.dropdown-menu-toggle.js-user-search.js-author-search.js-multiselect.js-save-user-data.js-issue-board-sidebar{ type: 'button', ref: 'assigneeDropdown', data: { toggle: 'dropdown', field_name: 'issue[assignee_ids][]', first_user: current_user&.username, current_user: 'true', project_id: @project.id, null_user: 'true', multi_select: 'true', 'dropdown-header': dropdown_options[:data][:'dropdown-header'], 'max-select': dropdown_options[:data][:'max-select'] },
-          ":data-issuable-id" => "issue.id",
-          ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
-          = dropdown_options[:title]
->>>>>>> ce/master
           = icon("chevron-down")
         .dropdown-menu.dropdown-select.dropdown-menu-user.dropdown-menu-selectable.dropdown-menu-author
           = dropdown_title("Assign to")

app/views/projects/environments/_terminal_button.html.haml

-<<<<<<< HEAD
 - if environment.deployment_service_ready? && can?(current_user, :admin_environment, @project)
-=======
-- if environment.has_terminals? && can?(current_user, :admin_environment, @project)
->>>>>>> ce/master
   = link_to terminal_project_environment_path(@project, environment), class: 'btn terminal-button' do
     = icon('terminal')

app/views/projects/issues/_head.html.haml

@@ -10,12 +10,8 @@
                 List
 
           = nav_link(controller: :boards) do
-<<<<<<< HEAD
             -# EE should use plural "Boards"
             = link_to project_boards_path(@project), title: 'Boards' do
-=======
-            = link_to project_boards_path(@project), title: 'Board' do
->>>>>>> ce/master
               %span
                 Boards
 

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

@@ -68,7 +68,6 @@
 
       = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue-edited-ago js-issue-edited-ago')
 
-<<<<<<< HEAD
     - if can?(current_user, :read_issue_link, @project)
       .js-related-issues-root{ data: { endpoint: project_issue_links_path(@project, @issue),
         can_add_related_issues: "#{can?(current_user, :update_issue, @issue)}",
@@ -79,8 +78,6 @@
               %h3.panel-title
                 Related issues
 
-=======
->>>>>>> ce/master
     #merge-requests{ data: { url: referenced_merge_requests_project_issue_url(@project, @issue) } }
       // This element is filled in using JavaScript.
 

app/views/projects/jobs/_sidebar.html.haml

@@ -32,11 +32,7 @@
             = link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do
               Download
 
-<<<<<<< HEAD
             - if @build.browsable_artifacts?
-=======
-            - if @build.artifacts_metadata?
->>>>>>> ce/master
               = link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default' do
                 Browse
 

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

@@ -63,10 +63,7 @@
           %span.js-truncated-info-size.truncated-info-size><
           KiB of log -
           %a.js-raw-link.raw-link{ href: raw_project_job_path(@project, @build) }>< Complete Raw
-<<<<<<< HEAD
-=======
 
->>>>>>> ce/master
         .controllers
           - if @build.has_trace?
             = link_to raw_project_job_path(@project, @build),

app/views/projects/project_members/_new_project_member.html.haml

@@ -18,9 +18,5 @@
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
           %i.clear-icon.js-clear-input
       = f.submit "Add to project", class: "btn btn-create"
-<<<<<<< HEAD
       - if can?(current_user, :admin_project_member, @project) && !membership_locked?
         = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
-=======
-      = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
->>>>>>> ce/master

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

@@ -75,12 +75,7 @@
 
 .tree-controls
   = render 'projects/find_file_link'
-<<<<<<< HEAD
   = lock_file_link(html_options: { class: 'btn btn-grouped path-lock' })
   = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn btn-grouped'
-=======
-
-  = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn'
->>>>>>> ce/master
 
   = render 'projects/buttons/download', project: @project, ref: @ref

app/views/search/results/_blob.html.haml

@@ -10,11 +10,6 @@
 .blob-result
   .file-holder
     .js-file-title.file-title
-<<<<<<< HEAD
-=======
-      - ref = @search_results.repository_ref
-      - blob_link = project_blob_path(@project, tree_join(ref, file_name))
->>>>>>> ce/master
       = link_to blob_link do
         = icon('fa-file')
         %strong

app/views/search/results/_wiki_blob.html.haml

@@ -4,11 +4,7 @@
 .blob-result
   .file-holder
     .js-file-title.file-title
-<<<<<<< HEAD
       = link_to project_wiki_path(project, wiki_blob.basename) do
-=======
-      = link_to project_wiki_path(@project, wiki_blob.basename) do
->>>>>>> ce/master
         %i.fa.fa-file
         %strong
           - if @project

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

@@ -27,11 +27,7 @@
             .scroll-container
               %ul.tokens-container.list-unstyled
                 %li.input-token
-<<<<<<< HEAD
-                  %input.form-control.filtered-search{ id: "filtered-search-#{type.to_s}", placeholder: 'Search or filter results...', data: { 'project-id' => @project.id, 'username-params' => @users.to_json(only: [:id, :username]), 'base-endpoint' => project_path(@project) } }
-=======
                   %input.form-control.filtered-search{ search_filter_input_options(type) }
->>>>>>> ce/master
               = icon('filter')
             #js-dropdown-hint.filtered-search-input-dropdown-menu.dropdown-menu.hint-dropdown
               %ul{ data: { dropdown: true } }

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

@@ -49,12 +49,8 @@
     - data = { field_name: "#{issuable.to_ability_name}[assignee_ids][]" }
     - data[:multi_select] = true
     - data['dropdown-title'] = title
-<<<<<<< HEAD
-    - data['dropdown-header'] = 'Assignee'
-=======
     - data['dropdown-header'] = dropdown_options[:data][:'dropdown-header']
     - data['max-select'] = dropdown_options[:data][:'max-select']
->>>>>>> ce/master
     - options[:data].merge!(data)
 
   = dropdown_tag(title, options: options)

app/views/shared/issuable/form/_metadata_issue_assignee.html.haml

@@ -7,9 +7,5 @@
     - if issuable.assignees.length === 0
       = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", 0, id: nil, data: { meta: '' }
 
-<<<<<<< HEAD
-    = dropdown_tag(users_dropdown_label(issuable.assignees), options: issue_dropdown_options(issuable,true))
-=======
     = dropdown_tag(users_dropdown_label(issuable.assignees), options: issue_assignees_dropdown_options)
->>>>>>> ce/master
   = link_to 'Assign to me', '#', class: "assign-to-me-link #{'hide' if issuable.assignees.include?(current_user)}"