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

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"