Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 36 insertions, 29 deletions

diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index 16902ebe1d4..d59c75de6d2 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -37,7 +37,7 @@
 
       - if project_nav_tab? :files
         = nav_link(controller: sidebar_repository_paths, unless: -> { current_path?('projects/graphs#charts') }) do
-          = link_to project_tree_path(@project), class: 'shortcuts-tree qa-project-menu-repo' do
+          = link_to project_tree_path(@project), class: 'shortcuts-tree', data: { qa_selector: "repository_link" } do
             .nav-icon-container
               = sprite_icon('doc-text')
             %span.nav-item-name#js-onboarding-repo-link
@@ -58,11 +58,11 @@
                 = _('Commits')
 
             = nav_link(html_options: {class: branches_tab_class}) do
-              = link_to project_branches_path(@project), class: 'qa-branches-link', id: 'js-onboarding-branches-link' do
+              = link_to project_branches_path(@project), data: { qa_selector: "branches_link" }, id: 'js-onboarding-branches-link' do
                 = _('Branches')
 
             = nav_link(controller: [:tags]) do
-              = link_to project_tags_path(@project) do
+              = link_to project_tags_path(@project), data: { qa_selector: "tags_link" } do
                 = _('Tags')
 
             = nav_link(path: 'graphs#show') do
@@ -80,7 +80,7 @@
             = render_if_exists 'projects/sidebar/repository_locked_files'
 
       - if project_nav_tab? :issues
-        = nav_link(controller: @project.issues_enabled? ? [:issues, :labels, :milestones, :boards] : :issues) do
+        = nav_link(controller: @project.issues_enabled? ? ['projects/issues', :labels, :milestones, :boards] : 'projects/issues') do
           = link_to project_issues_path(@project), class: 'shortcuts-issues qa-issues-item' do
             .nav-icon-container
               = sprite_icon('issues')
@@ -91,7 +91,7 @@
                 = number_with_delimiter(@project.open_issues_count(current_user))
 
           %ul.sidebar-sub-level-items
-            = nav_link(controller: :issues, action: :index, html_options: { class: "fly-out-top-item" } ) do
+            = nav_link(controller: 'projects/issues', action: :index, html_options: { class: "fly-out-top-item" } ) do
               = link_to project_issues_path(@project) do
                 %strong.fly-out-top-item-name
                   = _('Issues')
@@ -114,25 +114,29 @@
                 %span
                   = _('Labels')
 
-            = render_if_exists 'projects/sidebar/issues_service_desk'
+            = render 'projects/sidebar/issues_service_desk'
 
             = nav_link(controller: :milestones) do
               = link_to project_milestones_path(@project), title: _('Milestones'), class: 'qa-milestones-link' do
                 %span
                   = _('Milestones')
-      - if project_nav_tab? :external_issue_tracker
-        = nav_link do
-          - issue_tracker = @project.external_issue_tracker
-          = link_to issue_tracker.issue_tracker_path, class: 'shortcuts-external_tracker' do
-            .nav-icon-container
-              = sprite_icon('external-link')
-            %span.nav-item-name
-              = issue_tracker.title
-          %ul.sidebar-sub-level-items.is-fly-out-only
-            = nav_link(html_options: { class: "fly-out-top-item" } ) do
-              = link_to issue_tracker.issue_tracker_path do
-                %strong.fly-out-top-item-name
-                  = issue_tracker.title
+
+      - if project_nav_tab?(:external_issue_tracker)
+        - issue_tracker = @project.external_issue_tracker
+        - if issue_tracker.is_a?(JiraService) && project_jira_issues_integration?
+          = render_if_exists 'layouts/nav/sidebar/project_jira_issues_link', issue_tracker: issue_tracker
+        - else
+          = nav_link do
+            = link_to issue_tracker.issue_tracker_path, target: '_blank', rel: 'noopener noreferrer', class: 'shortcuts-external_tracker' do
+              .nav-icon-container
+                = sprite_icon('external-link')
+              %span.nav-item-name
+                = issue_tracker.title
+            %ul.sidebar-sub-level-items.is-fly-out-only
+              = nav_link(html_options: { class: "fly-out-top-item" } ) do
+                = link_to issue_tracker.issue_tracker_path, target: '_blank', rel: 'noopener noreferrer' do
+                  %strong.fly-out-top-item-name
+                    = issue_tracker.title
 
       - if (project_nav_tab? :labels) && !@project.issues_enabled?
         = nav_link(controller: [:labels]) do
@@ -289,19 +293,22 @@
 
       = render 'layouts/nav/sidebar/analytics_links', links: project_analytics_navbar_links(@project, current_user)
 
-      - if project_nav_tab? :wiki
-        - wiki_url = wiki_path(@project.wiki)
-        = nav_link(controller: :wikis) do
-          = link_to wiki_url, class: 'shortcuts-wiki', data: { qa_selector: 'wiki_link' } do
+      - if project_nav_tab?(:confluence)
+        - confluence_url = project_wikis_confluence_path(@project)
+        = nav_link do
+          = link_to confluence_url, class: 'shortcuts-confluence' do
             .nav-icon-container
-              = sprite_icon('book')
+              = image_tag 'confluence.svg', alt: _('Confluence')
             %span.nav-item-name
-              = _('Wiki')
+              = _('Confluence')
           %ul.sidebar-sub-level-items.is-fly-out-only
-            = nav_link(controller: :wikis, html_options: { class: "fly-out-top-item" } ) do
-              = link_to wiki_url do
+            = nav_link(html_options: { class: 'fly-out-top-item' } ) do
+              = link_to confluence_url, target: '_blank', rel: 'noopener noreferrer' do
                 %strong.fly-out-top-item-name
-                  = _('Wiki')
+                  = _('Confluence')
+
+      - if project_nav_tab? :wiki
+        = render 'layouts/nav/sidebar/wiki_link', wiki_url: wiki_path(@project.wiki)
 
       - if project_nav_tab?(:external_wiki)
         - external_wiki_url = @project.external_wiki.external_wiki_url
@@ -344,7 +351,7 @@
 
       - if project_nav_tab? :settings
         = nav_link(path: sidebar_settings_paths) do
-          = link_to edit_project_path(@project), class: 'shortcuts-tree' do
+          = link_to edit_project_path(@project) do
             .nav-icon-container
               = sprite_icon('settings')
             %span.nav-item-name.qa-settings-item#js-onboarding-settings-link