Project Sidebar: Split CI/CD into CI/CD and Operations

app/helpers/projects_helper.rb

@@ -257,6 +257,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 10:49+0200\n"
-"PO-Revision-Date: 2018-05-14 10:49+0200\n"
+"POT-Creation-Date: 2018-05-15 15:05+0200\n"
+"PO-Revision-Date: 2018-05-15 15:05+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -53,6 +53,16 @@ msgid_plural "%d metrics"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%d staged change"
+msgid_plural "%d staged changes"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "%d unstaged change"
+msgid_plural "%d unstaged changes"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%s additional commit has been omitted to prevent performance issues."
 msgid_plural "%s additional commits have been omitted to prevent performance issues."
 msgstr[0] ""
@@ -101,6 +111,9 @@ msgstr ""
 msgid "%{title} changes"
 msgstr ""
 
+msgid "%{unstaged} unstaged and %{staged} staged changes"
+msgstr ""
+
 msgid "(checkout the %{link} for information on how to install it)."
 msgstr ""
 
@@ -207,6 +220,9 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+msgid "Active Sessions"
+msgstr ""
+
 msgid "Activity"
 msgstr ""
 
@@ -315,6 +331,9 @@ msgstr ""
 msgid "An error occurred when toggling the notification subscription"
 msgstr ""
 
+msgid "An error occurred while dismissing the alert. Refresh the page and try again."
+msgstr ""
+
 msgid "An error occurred while dismissing the feature highlight. Refresh the page and try dismissing again."
 msgstr ""
 
@@ -1022,6 +1041,9 @@ msgstr ""
 msgid "ClusterIntegration|Environment scope"
 msgstr ""
 
+msgid "ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for new GCP accounts to get started with GitLab's Google Kubernetes Engine Integration."
+msgstr ""
+
 msgid "ClusterIntegration|GitLab Integration"
 msgstr ""
 
@@ -1145,6 +1167,9 @@ msgstr ""
 msgid "ClusterIntegration|Read our %{link_to_help_page} on Kubernetes cluster integration."
 msgstr ""
 
+msgid "ClusterIntegration|Redeem up to $500 in free credit for Google Cloud Platform"
+msgstr ""
+
 msgid "ClusterIntegration|Remove Kubernetes cluster integration"
 msgstr ""
 
@@ -1235,6 +1260,9 @@ msgstr ""
 msgid "ClusterIntegration|properly configured"
 msgstr ""
 
+msgid "ClusterIntegration|sign up"
+msgstr ""
+
 msgid "Collapse"
 msgstr ""
 
@@ -1359,6 +1387,9 @@ msgstr ""
 msgid "Configure limits for web and API requests."
 msgstr ""
 
+msgid "Configure push mirrors."
+msgstr ""
+
 msgid "Configure storage path and circuit breaker settings."
 msgstr ""
 
@@ -1524,6 +1555,9 @@ msgstr ""
 msgid "CreateTokenToCloneLink|create a personal access token"
 msgstr ""
 
+msgid "Created"
+msgstr ""
+
 msgid "Cron Timezone"
 msgstr ""
 
@@ -1595,6 +1629,54 @@ msgstr[1] ""
 msgid "Deploy Keys"
 msgstr ""
 
+msgid "DeployKeys|+%{count} others"
+msgstr ""
+
+msgid "DeployKeys|Current project"
+msgstr ""
+
+msgid "DeployKeys|Deploy key"
+msgstr ""
+
+msgid "DeployKeys|Enabled deploy keys"
+msgstr ""
+
+msgid "DeployKeys|Error enabling deploy key"
+msgstr ""
+
+msgid "DeployKeys|Error getting deploy keys"
+msgstr ""
+
+msgid "DeployKeys|Error removing deploy key"
+msgstr ""
+
+msgid "DeployKeys|Expand %{count} other projects"
+msgstr ""
+
+msgid "DeployKeys|Loading deploy keys"
+msgstr ""
+
+msgid "DeployKeys|No deploy keys found. Create one with the form above."
+msgstr ""
+
+msgid "DeployKeys|Privately accessible deploy keys"
+msgstr ""
+
+msgid "DeployKeys|Project usage"
+msgstr ""
+
+msgid "DeployKeys|Publicly accessible deploy keys"
+msgstr ""
+
+msgid "DeployKeys|Read access only"
+msgstr ""
+
+msgid "DeployKeys|Write access allowed"
+msgstr ""
+
+msgid "DeployKeys|You are going to remove this deploy key. Are you sure?"
+msgstr ""
+
 msgid "DeployTokens|Active Deploy Tokens (%{active_tokens})"
 msgstr ""
 
@@ -1751,9 +1833,6 @@ msgstr ""
 msgid "Edit files in the editor and commit changes here"
 msgstr ""
 
-msgid "Editing"
-msgstr ""
-
 msgid "Email"
 msgstr ""
 
@@ -1793,6 +1872,9 @@ msgstr ""
 msgid "Enable the Performance Bar for a given group."
 msgstr ""
 
+msgid "Environments"
+msgstr ""
+
 msgid "Environments|An error occurred while fetching the environments."
 msgstr ""
 
@@ -2005,6 +2087,9 @@ msgstr ""
 msgid "GPG Keys"
 msgstr ""
 
+msgid "General"
+msgstr ""
+
 msgid "Generate a default set of labels"
 msgstr ""
 
@@ -2053,6 +2138,9 @@ msgstr ""
 msgid "Got it!"
 msgstr ""
 
+msgid "Graph"
+msgstr ""
+
 msgid "Group CI/CD settings"
 msgstr ""
 
@@ -2166,6 +2254,18 @@ msgstr ""
 msgid "Housekeeping successfully started"
 msgstr ""
 
+msgid "IDE|Commit"
+msgstr ""
+
+msgid "IDE|Edit"
+msgstr ""
+
+msgid "IDE|Go back"
+msgstr ""
+
+msgid "IDE|Review"
+msgstr ""
+
 msgid "If you already have files you can push them using the %{link_to_cli} below."
 msgstr ""
 
@@ -2199,6 +2299,9 @@ msgstr ""
 msgid "Instance does not support multiple Kubernetes clusters"
 msgstr ""
 
+msgid "Integrations"
+msgstr ""
+
 msgid "Interested parties can even contribute by pushing commits if they want to."
 msgstr ""
 
@@ -2336,6 +2439,9 @@ msgstr ""
 msgid "LastPushEvent|at"
 msgstr ""
 
+msgid "Latest changes"
+msgstr ""
+
 msgid "Learn more"
 msgstr ""
 
@@ -2360,6 +2466,9 @@ msgstr ""
 msgid "Leave project"
 msgstr ""
 
+msgid "List"
+msgstr ""
+
 msgid "List your GitHub repositories"
 msgstr ""
 
@@ -2462,6 +2571,9 @@ msgstr ""
 msgid "Milestone"
 msgstr ""
 
+msgid "Milestones"
+msgstr ""
+
 msgid "Milestones|Delete milestone"
 msgstr ""
 
@@ -2719,6 +2831,9 @@ msgstr ""
 msgid "Opens in a new window"
 msgstr ""
 
+msgid "Operations"
+msgstr ""
+
 msgid "Options"
 msgstr ""
 
@@ -2878,25 +2993,22 @@ msgstr ""
 msgid "Pipelines|This project is not currently set up to run pipelines."
 msgstr ""
 
-msgid "Pipeline|Existing branch name, tag"
+msgid "Pipeline|Create for"
 msgstr ""
 
-msgid "Pipeline|Retry pipeline"
+msgid "Pipeline|Create pipeline"
 msgstr ""
 
-msgid "Pipeline|Retry pipeline #%{pipelineId}?"
+msgid "Pipeline|Existing branch name or tag"
 msgstr ""
 
 msgid "Pipeline|Run Pipeline"
 msgstr ""
 
-msgid "Pipeline|Run on"
-msgstr ""
-
-msgid "Pipeline|Run pipeline"
+msgid "Pipeline|Search branches"
 msgstr ""
 
-msgid "Pipeline|Search branches"
+msgid "Pipeline|Specify variable values to be used in this run. The values specified in %{settings_link} will be used by default."
 msgstr ""
 
 msgid "Pipeline|Stop pipeline"
@@ -2905,7 +3017,7 @@ msgstr ""
 msgid "Pipeline|Stop pipeline #%{pipelineId}?"
 msgstr ""
 
-msgid "Pipeline|You’re about to retry pipeline %{pipelineId}."
+msgid "Pipeline|Variables"
 msgstr ""
 
 msgid "Pipeline|You’re about to stop pipeline %{pipelineId}."
@@ -3022,6 +3134,9 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
+msgid "Project"
+msgstr ""
+
 msgid "Project '%{project_name}' is in the process of being deleted."
 msgstr ""
 
@@ -3073,9 +3188,6 @@ msgstr ""
 msgid "ProjectLifecycle|Stage"
 msgstr ""
 
-msgid "ProjectNetworkGraph|Graph"
-msgstr ""
-
 msgid "Projects"
 msgstr ""
 
@@ -3226,6 +3338,9 @@ msgstr ""
 msgid "Register and see your runners for this group."
 msgstr ""
 
+msgid "Registry"
+msgstr ""
+
 msgid "Related Commits"
 msgstr ""
 
@@ -3268,6 +3383,9 @@ msgstr ""
 msgid "Repository maintenance"
 msgstr ""
 
+msgid "Repository mirror settings"
+msgstr ""
+
 msgid "Repository storage"
 msgstr ""
 
@@ -3363,6 +3481,9 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+msgid "Search branches"
+msgstr ""
+
 msgid "Search branches and tags"
 msgstr ""
 
@@ -3405,6 +3526,9 @@ msgstr ""
 msgid "Select branch/tag"
 msgstr ""
 
+msgid "Select source branch"
+msgstr ""
+
 msgid "Select target branch"
 msgstr ""
 
@@ -3937,6 +4061,9 @@ msgstr ""
 msgid "This merge request is locked."
 msgstr ""
 
+msgid "This option is disabled while you still have unstaged changes"
+msgstr ""
+
 msgid "This page is unavailable because you are not allowed to read information across multiple projects."
 msgstr ""
 
@@ -4253,9 +4380,6 @@ msgstr ""
 msgid "Verified"
 msgstr ""
 
-msgid "View and edit lines"
-msgstr ""
-
 msgid "View file @ "
 msgstr ""
 
@@ -4373,6 +4497,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

@@ -36,16 +36,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: 1)
+      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