fixed navigation conflicts

[ci skip]

app/assets/stylesheets/new_nav.scss

@@ -2,13 +2,10 @@
 @import 'framework/tw_bootstrap_variables';
 @import "bootstrap/variables";
 @import "framework/mixins";
-<<<<<<< HEAD
-=======
 
 .content-wrapper.page-with-new-nav {
   margin-top: $new-navbar-height;
 }
->>>>>>> upstream/master
 
 header.navbar-gitlab-new {
   color: $white-light;
@@ -431,8 +428,6 @@ header.navbar-gitlab-new {
     }
   }
 }
-<<<<<<< HEAD
-=======
 
 .breadcrumb-item-text {
   @include str-truncated(128px);
@@ -452,32 +447,6 @@ header.navbar-gitlab-new {
   margin-left: auto;
 }
 
-.breadcrumbs-sub-title {
-  margin: 0;
-  font-size: 12px;
-  font-weight: 600;
-  line-height: 1;
->>>>>>> upstream/master
-
-.breadcrumb-item-text {
-  @include str-truncated(128px);
-}
-
-<<<<<<< HEAD
-.breadcrumbs-list-angle {
-  position: absolute;
-  right: -12px;
-  top: 50%;
-  color: $gl-text-color-tertiary;
-  transform: translateY(-50%);
-}
-
-.breadcrumbs-extra {
-  display: flex;
-  flex: 0 0 auto;
-  margin-left: auto;
-}
-
 .breadcrumbs-sub-title {
   margin: 0;
   font-size: 12px;
@@ -486,13 +455,14 @@ header.navbar-gitlab-new {
 
   a {
     color: $gl-text-color;
-=======
+  }
+}
+
 .btn-sign-in {
   margin-top: 3px;
   font-weight: $gl-font-weight-bold;
 
   &:hover {
     background-color: $white-light;
->>>>>>> upstream/master
   }
 }

app/views/layouts/_page.html.haml

 .page-with-sidebar{ class: page_with_sidebar_class }
   - if defined?(nav) && nav
     = render "layouts/nav/sidebar/#{nav}"
-<<<<<<< HEAD
-  .content-wrapper
-=======
   .content-wrapper.page-with-new-nav
->>>>>>> upstream/master
     .mobile-overlay
     .alert-wrapper
       = render "layouts/broadcast"

app/views/layouts/header/_default.html.haml

-<<<<<<< HEAD
 = render "layouts/header/ee_license_banner"
 
-=======
->>>>>>> upstream/master
 %header.navbar.navbar-gitlab.navbar-gitlab-new
   %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
   .container-fluid
@@ -29,35 +26,13 @@
             = link_to search_path, title: 'Search', aria: { label: "Search" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
               = icon('search')
           - if current_user
-<<<<<<< HEAD
-            - if session[:impersonator_id]
-              %li.impersonation
-                = link_to admin_impersonation_path, method: :delete, title: "Stop impersonation", aria: { label: 'Stop impersonation' }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
-                  = icon('user-secret fw')
-            - if current_user.admin?
-              %li
-                = link_to admin_root_path, title: 'Admin area', aria: { label: "Admin area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-                  = icon('wrench fw')
-            = render 'layouts/header/new_dropdown'
-            - if Gitlab::Sherlock.enabled?
-              %li
-                = link_to sherlock_transactions_path, title: 'Sherlock Transactions',
-                  data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-                  = icon('tachometer fw')
-            %li
-=======
             %li.user-counter
->>>>>>> upstream/master
               = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                 = custom_icon('issues')
                 - issues_count = assigned_issuables_count(:issues)
                 %span.badge.issues-count{ class: ('hidden' if issues_count.zero?) }
                   = number_with_delimiter(issues_count)
-<<<<<<< HEAD
-            %li
-=======
             %li.user-counter
->>>>>>> upstream/master
               = link_to assigned_mrs_dashboard_path, title: 'Merge requests', class: 'dashboard-shortcuts-merge_requests', aria: { label: "Merge requests" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                 = custom_icon('mr_bold')
                 - merge_requests_count = assigned_issuables_count(:merge_requests)
@@ -68,28 +43,10 @@
                 = custom_icon('todo_done')
                 %span.badge.todos-count{ class: ('hidden' if todos_pending_count.zero?) }
                   = todos_count_format(todos_pending_count)
-
-            - if Gitlab::Geo.secondary?
-              %li
-                = link_to Gitlab::Geo.primary_node.url, title: 'Go to primary node', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-                  = icon('globe fw')
-
-            - if Gitlab::Sherlock.enabled?
-              %li
-                = link_to sherlock_transactions_path, title: 'Sherlock Transactions',
-                  data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-                  = icon('tachometer fw')
-
             %li.header-user.dropdown
-<<<<<<< HEAD
-              = link_to current_user, class: "header-user-dropdown-toggle", data: { toggle: "dropdown" } do
-                = image_tag avatar_icon(current_user, 26), width: 26, height: 26, class: "header-user-avatar"
-                = icon('chevron-down')
-=======
               = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
                 = image_tag avatar_icon(current_user, 23), width: 23, height: 23, class: "header-user-avatar"
                 = custom_icon('caret_down')
->>>>>>> upstream/master
               .dropdown-menu-nav.dropdown-menu-align-right
                 %ul
                   %li.current-user

app/views/layouts/header/_new_dropdown.haml

 %li.header-new.dropdown
   = link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip", title: "New...", ref: 'tooltip', aria: { label: "New..." }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body' } do
-<<<<<<< HEAD
-    = icon('plus')
-    = icon('chevron-down')
-=======
     = custom_icon('plus_square')
     = custom_icon('caret_down')
->>>>>>> upstream/master
   .dropdown-menu-nav.dropdown-menu-align-right
     %ul
       - if @group&.persisted?

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

 %ul.list-unstyled.navbar-sub-nav
-<<<<<<< HEAD
-  = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "home"}) do
-    = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
-      Projects
-
-  = nav_link(controller: ['dashboard/groups', 'explore/groups']) do
-    = link_to dashboard_groups_path, class: 'dashboard-shortcuts-groups', title: 'Groups' do
-      Groups
-
-  = nav_link(path: 'dashboard#activity', html_options: { class: "hidden-xs hidden-sm" }) do
-    = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
-      Activity
-
-  %li.dropdown
-    %a{ href: "#", data: { toggle: "dropdown" } }
-      More
-      = icon("chevron-down", class: "dropdown-chevron")
-    .dropdown-menu
-      %ul
-        = nav_link(path: 'dashboard#activity', html_options: { class: "visible-xs visible-sm" }) do
-=======
   = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: { id: 'nav-projects-dropdown', class: "home dropdown header-projects" }) do
     %a{ href: "#", data: { toggle: "dropdown" } }
       Projects
@@ -54,7 +33,6 @@
             Groups
 
         = nav_link(path: 'dashboard#activity') do
->>>>>>> upstream/master
           = link_to activity_dashboard_path, title: 'Activity' do
             Activity
 
@@ -65,11 +43,6 @@
         = nav_link(controller: 'dashboard/snippets') do
           = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do
             Snippets
-<<<<<<< HEAD
-        %li.divider
-        %li
-          = link_to "Help", help_path, title: 'About GitLab CE'
-=======
 
   -# Shortcut to Dashboard > Projects
   %li.hidden
@@ -87,4 +60,7 @@
       = link_to sherlock_transactions_path, class: 'admin-icon', title: 'Sherlock Transactions',
         data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
         = icon('tachometer fw')
->>>>>>> upstream/master
+  - if Gitlab::Geo.secondary?
+    %li
+      = link_to Gitlab::Geo.primary_node.url, title: 'Go to primary node', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+        = icon('globe fw')

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

@@ -5,23 +5,8 @@
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to explore_groups_path, title: 'Groups', class: 'dashboard-shortcuts-groups' do
       Groups
-<<<<<<< HEAD
-  %li.dropdown
-    %a{ href: "#", data: { toggle: "dropdown" } }
-      More
-      = icon("chevron-down", class: "dropdown-chevron")
-    .dropdown-menu
-      %ul
-        = nav_link(controller: :snippets) do
-          = link_to explore_snippets_path, title: 'Snippets', class: 'dashboard-shortcuts-snippets' do
-            Snippets
-        %li.divider
-        %li
-          = link_to "Help", help_path, title: 'About GitLab CE'
-=======
   = nav_link(controller: :snippets) do
     = link_to explore_snippets_path, title: 'Snippets', class: 'dashboard-shortcuts-snippets' do
       Snippets
   %li
     = link_to "Help", help_path, title: 'About GitLab CE'
->>>>>>> upstream/master

app/views/layouts/nav/sidebar/_group.html.haml

 - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
 - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute
-<<<<<<< HEAD:app/views/layouts/nav/sidebar/_group.html.haml
+
 - issues_sub_menu_items = ['groups#issues', 'labels#index', 'milestones#index']
 - if @group.feature_available?(:group_issue_boards)
   - issues_sub_menu_items.push('boards#index')
-=======
->>>>>>> upstream/master:app/views/layouts/nav/sidebar/_group.html.haml
 
 .nav-sidebar{ class: ("sidebar-icons-only" if collapsed_sidebar?) }
   .nav-sidebar-inner-scroll

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

@@ -110,11 +110,7 @@
                 = number_with_delimiter(@project.open_issues_count)
 
           %ul.sidebar-sub-level-items
-<<<<<<< HEAD:app/views/layouts/nav/sidebar/_project.html.haml
             = nav_link(controller: :issues, action: :index, html_options: { class: "fly-out-top-item" } ) do
-=======
-            = nav_link(controller: :issues, html_options: { class: "fly-out-top-item" } ) do
->>>>>>> upstream/master:app/views/layouts/nav/sidebar/_project.html.haml
               = link_to project_issues_path(@project) do
                 %strong.fly-out-top-item-name
                   #{ _('Issues') }

app/views/layouts/project.html.haml

@@ -10,9 +10,5 @@
     -# haml-lint:disable InlineJavaScript
     :javascript
       window.uploads_path = "#{project_uploads_path(project)}";
-<<<<<<< HEAD
-      window.preview_markdown_path = "#{preview_markdown_path(project)}";
-=======
->>>>>>> upstream/master
 
 = render template: "layouts/application"

spec/helpers/groups_helper_spec.rb

@@ -110,11 +110,7 @@ describe GroupsHelper do
     let(:deep_nested_group) { create(:group, parent: nested_group) }
     let!(:very_deep_nested_group) { create(:group, parent: deep_nested_group) }
 
-<<<<<<< HEAD
     it 'outputs the groups in the correct order', :postgresql do
-=======
-    it 'outputs the groups in the correct order' do
->>>>>>> upstream/master
       expect(helper.group_title(very_deep_nested_group))
         .to match(/<li style="text-indent: 16px;"><a.*>#{deep_nested_group.name}.*<\/li>.*<a.*>#{very_deep_nested_group.name}<\/a>/m)
     end