Port of gitlab-ce!18941

app/helpers/projects_helper.rb

@@ -259,6 +259,7 @@ module ProjectsHelper
 
     if project.builds_enabled? && can?(current_user, :read_pipeline, project)
       nav_tabs << :pipelines
+      nav_tabs << :operations
     end
 
     if project.external_issue_tracker

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

@@ -13,13 +13,13 @@
           .nav-icon-container
             = sprite_icon('project')
           %span.nav-item-name
-            Project
+            = _('Project')
 
         %ul.sidebar-sub-level-items
           = nav_link(path: 'projects#show', html_options: { class: "fly-out-top-item" } ) do
             = link_to project_path(@project) do
               %strong.fly-out-top-item-name
-                #{ _('Overview') }
+                = _('Overview')
           %li.divider.fly-out-top-item
           = nav_link(path: 'projects#show') do
             = link_to project_path(@project), title: _('Project details'), class: 'shortcuts-project' do
@@ -40,45 +40,45 @@
             .nav-icon-container
               = sprite_icon('doc_text')
             %span.nav-item-name
-              Repository
+              = _('Repository')
 
           %ul.sidebar-sub-level-items
             = 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), html_options: { class: "fly-out-top-item" } ) do
               = link_to project_tree_path(@project) do
                 %strong.fly-out-top-item-name
-                  #{ _('Repository') }
+                  = _('Repository')
             %li.divider.fly-out-top-item
             = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
               = link_to project_tree_path(@project) do
-                #{ _('Files') }
+                = _('Files')
 
             = nav_link(controller: [:commit, :commits]) do
               = link_to project_commits_path(@project, current_ref) do
-                #{ _('Commits') }
+                = _('Commits')
 
             = nav_link(html_options: {class: branches_tab_class}) do
               = link_to project_branches_path(@project) do
-                #{ _('Branches') }
+                = _('Branches')
 
             = nav_link(controller: [:tags, :releases]) do
               = link_to project_tags_path(@project) do
-                #{ _('Tags') }
+                = _('Tags')
 
             = nav_link(path: 'graphs#show') do
               = link_to project_graph_path(@project, current_ref) do
-                #{ _('Contributors') }
+                = _('Contributors')
 
             = nav_link(controller: %w(network)) do
               = link_to project_network_path(@project, current_ref) do
-                #{ s_('ProjectNetworkGraph|Graph') }
+                = _('Graph')
 
             = nav_link(controller: :compare) do
               = link_to project_compare_index_path(@project, from: @repository.root_ref, to: current_ref) do
-                #{ _('Compare') }
+                = _('Compare')
 
             = nav_link(path: 'graphs#charts') do
               = link_to charts_project_graph_path(@project, current_ref) do
-                #{ _('Charts') }
+                = _('Charts')
 
             - if @project.feature_available?(:file_locks)
               = nav_link(controller: [:path_locks]) do
@@ -91,7 +91,7 @@
             .nav-icon-container
               = sprite_icon('issues')
             %span.nav-item-name
-              Issues
+              = _('Issues')
             - if @project.issues_enabled?
               %span.badge.count.issue_counter
                 = number_with_delimiter(@project.open_issues_count)
@@ -100,7 +100,7 @@
             = nav_link(controller: :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') }
+                  = _('Issues')
                 - if @project.issues_enabled?
                   %span.badge.count.issue_counter.fly-out-badge
                     = number_with_delimiter(@project.open_issues_count)
@@ -108,7 +108,7 @@
             = nav_link(controller: :issues, action: :index) do
               = link_to project_issues_path(@project), title: 'Issues' do
                 %span
-                  List
+                  = _('List')
 
             = nav_link(controller: :boards) do
               = link_to project_boards_path(@project), title: boards_link_text do
@@ -117,7 +117,7 @@
             = nav_link(controller: :labels) do
               = link_to project_labels_path(@project), title: 'Labels' do
                 %span
-                  Labels
+                  = _('Labels')
 
             - if EE::Gitlab::ServiceDesk.enabled?(project: @project)
               = nav_link(controller: :issues, action: :service_desk ) do
@@ -127,7 +127,7 @@
             = nav_link(controller: :milestones) do
               = link_to project_milestones_path(@project), title: 'Milestones' do
                 %span
-                  Milestones
+                  = _('Milestones')
       - if project_nav_tab? :external_issue_tracker
         = nav_link do
           - issue_tracker = @project.external_issue_tracker
@@ -148,54 +148,75 @@
             .nav-icon-container
               = sprite_icon('git-merge')
             %span.nav-item-name
-              Merge Requests
+              = _('Merge Requests')
             %span.badge.count.merge_counter.js-merge-counter
               = number_with_delimiter(@project.open_merge_requests_count)
           %ul.sidebar-sub-level-items.is-fly-out-only
             = nav_link(controller: :merge_requests, html_options: { class: "fly-out-top-item" } ) do
               = link_to project_merge_requests_path(@project) do
                 %strong.fly-out-top-item-name
-                  #{ _('Merge Requests') }
+                  = _('Merge Requests')
                 %span.badge.count.merge_counter.js-merge-counter.fly-out-badge
                   = number_with_delimiter(@project.open_merge_requests_count)
 
       - if project_nav_tab? :pipelines
-        = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts, :clusters, :user, :gcp]) do
+        = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :artifacts]) do
           = link_to project_pipelines_path(@project), class: 'shortcuts-pipelines' do
             .nav-icon-container
               = sprite_icon('pipeline')
             %span.nav-item-name
-              CI / CD
+              = _('CI / CD')
 
           %ul.sidebar-sub-level-items
-            = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts, :clusters, :user, :gcp], html_options: { class: "fly-out-top-item" } ) do
+            = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :artifacts], html_options: { class: "fly-out-top-item" }  ) do
               = link_to project_pipelines_path(@project) do
                 %strong.fly-out-top-item-name
-                  #{ _('CI / CD') }
+                  =  _('CI / CD')
             %li.divider.fly-out-top-item
             - if project_nav_tab? :pipelines
               = nav_link(path: ['pipelines#index', 'pipelines#show']) do
                 = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
                   %span
-                    Pipelines
+                    = _('Pipelines')
 
             - if project_nav_tab? :builds
               = nav_link(controller: [:jobs, :artifacts]) do
                 = link_to project_jobs_path(@project), title: 'Jobs', class: 'shortcuts-builds' do
                   %span
-                    Jobs
+                    = _('Jobs')
 
             - if project_nav_tab? :pipelines
               = nav_link(controller: :pipeline_schedules) do
                 = link_to pipeline_schedules_path(@project), title: 'Schedules', class: 'shortcuts-builds' do
                   %span
-                    Schedules
+                    = _('Schedules')
+
+            - if @project.feature_available?(:builds, current_user) && !@project.empty_repo?
+              = nav_link(path: 'pipelines#charts') do
+                = link_to charts_project_pipelines_path(@project), title: 'Charts', class: 'shortcuts-pipelines-charts' do
+                  %span
+                    = _('Charts')
+
+      - if project_nav_tab? :operations
+        = nav_link(controller: [:environments, :clusters, :user, :gcp]) do
+          = link_to project_environments_path(@project), class: 'shortcuts-operations' do
+            .nav-icon-container
+              = sprite_icon('cloud-gear')
+            %span.nav-item-name
+              = _('Operations')
+
+          %ul.sidebar-sub-level-items
+            = nav_link(controller: [:environments, :clusters, :user, :gcp], html_options: { class: "fly-out-top-item" } ) do
+              = link_to project_environments_path(@project) do
+                %strong.fly-out-top-item-name
+                  =  _('Operations')
+            %li.divider.fly-out-top-item
 
             - if project_nav_tab? :environments
               = nav_link(controller: :environments) do
                 = link_to project_environments_path(@project), title: 'Environments', class: 'shortcuts-environments' do
                   %span
-                    Environments
+                    = _('Environments')
 
             - if project_nav_tab? :clusters
               - show_cluster_hint = show_gke_cluster_integration_callout?(@project)
@@ -226,25 +247,18 @@
                         %span= _("Got it!")
                         = sprite_icon('thumb-up')
 
-            - if @project.feature_available?(:builds, current_user) && !@project.empty_repo?
-              = nav_link(path: 'pipelines#charts') do
-                = link_to charts_project_pipelines_path(@project), title: 'Charts', class: 'shortcuts-pipelines-charts' do
-                  %span
-                    Charts
-
       - if project_nav_tab? :container_registry
         = nav_link(controller: %w[projects/registry/repositories]) do
           = link_to project_container_registry_index_path(@project), class: 'shortcuts-container-registry' do
             .nav-icon-container
               = sprite_icon('disk')
             %span.nav-item-name
-              Registry
+              = _('Registry')
           %ul.sidebar-sub-level-items.is-fly-out-only
             = nav_link(controller: %w[projects/registry/repositories], html_options: { class: "fly-out-top-item" } ) do
               = link_to project_container_registry_index_path(@project) do
                 %strong.fly-out-top-item-name
-                  #{ _('Registry') }
-
+                  = _('Registry')
 
       - if project_nav_tab? :wiki
         = nav_link(controller: :wikis) do
@@ -252,12 +266,12 @@
             .nav-icon-container
               = sprite_icon('book')
             %span.nav-item-name
-              Wiki
+              = _('Wiki')
           %ul.sidebar-sub-level-items.is-fly-out-only
             = nav_link(controller: :wikis, html_options: { class: "fly-out-top-item" } ) do
               = link_to get_project_wiki_path(@project) do
                 %strong.fly-out-top-item-name
-                  #{ _('Wiki') }
+                  = _('Wiki')
 
       - if project_nav_tab? :snippets
         = nav_link(controller: :snippets) do
@@ -265,12 +279,12 @@
             .nav-icon-container
               = sprite_icon('snippet')
             %span.nav-item-name
-              Snippets
+              = _('Snippets')
           %ul.sidebar-sub-level-items.is-fly-out-only
             = nav_link(controller: :snippets, html_options: { class: "fly-out-top-item" } ) do
               = link_to project_snippets_path(@project) do
                 %strong.fly-out-top-item-name
-                  #{ _('Snippets') }
+                  = _('Snippets')
 
       - if project_nav_tab? :settings
         = nav_link(path: %w[projects#edit project_members#index integrations#show services#edit repository#show ci_cd#show badges#index pages#show audit_events#index]) do
@@ -278,7 +292,7 @@
             .nav-icon-container
               = sprite_icon('settings')
             %span.nav-item-name.qa-settings-item
-              Settings
+              = _('Settings')
 
           %ul.sidebar-sub-level-items
             - can_edit = can?(current_user, :admin_project, @project)
@@ -286,16 +300,16 @@
               = nav_link(path: %w[projects#edit project_members#index integrations#show services#edit repository#show ci_cd#show badges#index pages#show audit_events#index], html_options: { class: "fly-out-top-item" } ) do
                 = link_to edit_project_path(@project) do
                   %strong.fly-out-top-item-name
-                    #{ _('Settings') }
+                    = _('Settings')
               %li.divider.fly-out-top-item
               = nav_link(path: %w[projects#edit]) do
                 = link_to edit_project_path(@project), title: 'General' do
                   %span
-                    General
+                    = _('General')
             = nav_link(controller: :project_members) do
               = link_to project_project_members_path(@project), title: 'Members' do
                 %span
-                  Members
+                  = _('Members')
             - if can_edit
               = nav_link(controller: :badges) do
                 = link_to project_settings_badges_path(@project), title: _('Badges') do
@@ -305,21 +319,21 @@
               = nav_link(controller: [:integrations, :services, :hooks, :hook_logs]) do
                 = link_to project_settings_integrations_path(@project), title: 'Integrations' do
                   %span
-                    Integrations
+                    = _('Integrations')
               = nav_link(controller: :repository) do
                 = link_to project_settings_repository_path(@project), title: 'Repository' do
                   %span
-                    Repository
+                    = _('Repository')
               - if @project.feature_available?(:builds, current_user)
                 = nav_link(controller: :ci_cd) do
                   = link_to project_settings_ci_cd_path(@project), title: 'CI / CD' do
                     %span
-                      CI / CD
+                      = _('CI / CD')
               - if @project.pages_available?
                 = nav_link(controller: :pages) do
                   = link_to project_pages_path(@project), title: 'Pages' do
                     %span
-                      Pages
+                      = _('Pages')
 
               = render 'projects/settings/ee/nav'
 
@@ -329,12 +343,12 @@
             .nav-icon-container
               = sprite_icon('users')
             %span.nav-item-name
-              Members
+              = _('Members')
           %ul.sidebar-sub-level-items.is-fly-out-only
             = nav_link(path: %w[members#show], html_options: { class: "fly-out-top-item" } ) do
               = link_to project_project_members_path(@project) do
                 %strong.fly-out-top-item-name
-                  #{ _('Members') }
+                  = _('Members')
 
       = render 'shared/sidebar_toggle_button'
 

changelogs/unreleased/43673-operations-tab-mvc.yml

+---
+title: Move project sidebar sub-entries 'Environments' and 'Kubernetes' from 'CI/CD' to a new entry 'Operations'
+merge_request: 18941
+author:
+type: changed

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-14 12:46+0200\n"
-"PO-Revision-Date: 2018-05-14 12:46+0200\n"
+"POT-Creation-Date: 2018-05-15 15:07+0200\n"
+"PO-Revision-Date: 2018-05-15 15:07+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -2156,6 +2156,9 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
+msgid "Environments"
+msgstr ""
+
 msgid "Environments|An error occurred while fetching the environments."
 msgstr ""
 
@@ -2416,6 +2419,9 @@ msgstr ""
 msgid "GPG Keys"
 msgstr ""
 
+msgid "General"
+msgstr ""
+
 msgid "Generate a default set of labels"
 msgstr ""
 
@@ -2431,9 +2437,6 @@ msgstr ""
 msgid "GeoNodeSyncStatus|Node is slow, overloaded, or it just recovered after an outage."
 msgstr ""
 
-msgid "GeoNodes|%{eventId}"
-msgstr ""
-
 msgid "GeoNodes|Checksummed"
 msgstr ""
 
@@ -2461,10 +2464,10 @@ msgstr ""
 msgid "GeoNodes|Health status"
 msgstr ""
 
-msgid "GeoNodes|Last event ID seen from primary"
+msgid "GeoNodes|Last event ID processed by cursor"
 msgstr ""
 
-msgid "GeoNodes|Last event ID processed by cursor"
+msgid "GeoNodes|Last event ID seen from primary"
 msgstr ""
 
 msgid "GeoNodes|Learn more about Repository checksum progress"
@@ -2659,6 +2662,9 @@ msgstr ""
 msgid "Got it!"
 msgstr ""
 
+msgid "Graph"
+msgstr ""
+
 msgid "Group CI/CD settings"
 msgstr ""
 
@@ -3247,6 +3253,9 @@ msgstr ""
 msgid "Milestone"
 msgstr ""
 
+msgid "Milestones"
+msgstr ""
+
 msgid "Milestones|Delete milestone"
 msgstr ""
 
@@ -3543,6 +3552,9 @@ msgstr ""
 msgid "Opens in a new window"
 msgstr ""
 
+msgid "Operations"
+msgstr ""
+
 msgid "Options"
 msgstr ""
 
@@ -3717,12 +3729,6 @@ msgstr ""
 msgid "Pipeline|Existing branch name or tag"
 msgstr ""
 
-msgid "Pipeline|Retry pipeline"
-msgstr ""
-
-msgid "Pipeline|Retry pipeline #%{pipelineId}?"
-msgstr ""
-
 msgid "Pipeline|Run Pipeline"
 msgstr ""
 
@@ -3741,9 +3747,6 @@ msgstr ""
 msgid "Pipeline|Variables"
 msgstr ""
 
-msgid "Pipeline|You’re about to retry pipeline %{pipelineId}."
-msgstr ""
-
 msgid "Pipeline|You’re about to stop pipeline %{pipelineId}."
 msgstr ""
 
@@ -3870,6 +3873,9 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
+msgid "Project"
+msgstr ""
+
 msgid "Project '%{project_name}' is in the process of being deleted."
 msgstr ""
 
@@ -3936,9 +3942,6 @@ msgstr ""
 msgid "ProjectLifecycle|Stage"
 msgstr ""
 
-msgid "ProjectNetworkGraph|Graph"
-msgstr ""
-
 msgid "ProjectSettings|Contact an admin to change this setting."
 msgstr ""
 
@@ -5536,6 +5539,12 @@ msgstr ""
 msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?"
 msgstr ""
 
+msgid "WikiPageConfirmDelete|Delete page"
+msgstr ""
+
+msgid "WikiPageConfirmDelete|Delete page %{pageTitle}?"
+msgstr ""
+
 msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs."
 msgstr ""
 

spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

@@ -45,16 +45,17 @@ describe 'layouts/nav/sidebar/_project' do
       expect(rendered).to have_text 'Registry'
     end
 
-    it 'highlights only one tab' do
+    it 'highlights sidebar item and flyout' do
       render
 
-      expect(rendered).to have_css('.active', count: 2)
+      expect(rendered).to have_css('.sidebar-top-level-items > li.active', count: 1)
+      expect(rendered).to have_css('.is-fly-out-only > li.active', count: 1)
     end
 
-    it 'highlights container registry tab only' do
+    it 'highlights container registry tab' do
       render
 
-      expect(rendered).to have_css('.active', text: 'Registry')
+      expect(rendered).to have_css('.sidebar-top-level-items > li.active', text: 'Registry')
     end
   end
 end

yarn.lock

@@ -65,13 +65,6 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
-
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
@@ -8713,10 +8706,6 @@ underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
-underscore@~1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
-
 underscore@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"