Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/blob/file_template_mediator.js

@@ -9,6 +9,7 @@ import GitignoreSelector from './template_selectors/gitignore_selector';
 import LicenseSelector from './template_selectors/license_selector';
 import toast from '~/vue_shared/plugins/global_toast';
 import { __ } from '~/locale';
+import initPopover from '~/blob/suggest_gitlab_ci_yml';
 export default class FileTemplateMediator {
   constructor({ editor, currentAction, projectId }) {
@@ -128,6 +129,7 @@ export default class FileTemplateMediator {
   selectTemplateFile(selector, query, data) {
     const self = this;
     const { name } = selector.config;
+    const suggestCommitChanges = document.querySelector('.js-suggest-gitlab-ci-yml-commit-changes');
     selector.renderLoading();
@@ -146,6 +148,10 @@ export default class FileTemplateMediator {
             },
           },
         });
+
+        if (suggestCommitChanges) {
+          initPopover(suggestCommitChanges);
+        }
       })
       .catch(err => new Flash(`An error occurred while fetching the template: ${err}`));
   }

app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue

 <script>
 import { GlPopover, GlSprintf, GlButton, GlIcon } from '@gitlab/ui';
 import Cookies from 'js-cookie';
-import { parseBoolean } from '~/lib/utils/common_utils';
+import { parseBoolean, scrollToElement } from '~/lib/utils/common_utils';
 import { s__ } from '~/locale';
 import { glEmojiTag } from '~/emoji';
+const popoverStates = {
+  suggest_gitlab_ci_yml: {
+    title: s__(`suggestPipeline|1/2: Choose a template`),
+    content: s__(
+      `suggestPipeline|We recommend the %{boldStart}Code Quality%{boldEnd} template, which will add a report widget to your Merge Requests. This way you’ll learn about code quality degradations much sooner. %{footerStart} Goodbye technical debt! %{footerEnd}`,
+    ),
+    emoji: glEmojiTag('wave'),
+  },
+  suggest_commit_first_project_gitlab_ci_yml: {
+    title: s__(`suggestPipeline|2/2: Commit your changes`),
+    content: s__(
+      `suggestPipeline|Commit the changes and your pipeline will automatically run for the first time.`,
+    ),
+  },
+};
 export default {
   components: {
     GlPopover,
@@ -17,7 +32,7 @@ export default {
       type: String,
       required: true,
     },
-    cssClass: {
+    trackLabel: {
       type: String,
       required: true,
     },
@@ -33,17 +48,19 @@ export default {
   },
   computed: {
     suggestTitle() {
-      return s__(`suggestPipeline|1/2: Choose a template`);
+      return popoverStates[this.trackLabel].title || '';
     },
     suggestContent() {
-      return s__(
-        `suggestPipeline|We recommend the %{boldStart}Code Quality%{boldEnd} template, which will add a report widget to your Merge Requests. This way you’ll learn about code quality degradations much sooner. %{footerStart} Goodbye technical debt! %{footerEnd}`,
-      );
+      return popoverStates[this.trackLabel].content || '';
     },
     emoji() {
-      return glEmojiTag('wave');
+      return popoverStates[this.trackLabel].emoji || '';
     },
   },
+  mounted() {
+    if (this.trackLabel === 'suggest_commit_first_project_gitlab_ci_yml' && !this.popoverDismissed)
+      scrollToElement(document.querySelector(this.target));
+  },
   methods: {
     onDismiss() {
       this.popoverDismissed = true;
@@ -61,13 +78,15 @@ export default {
     placement="rightbottom"
     trigger="manual"
     container="viewport"
-    :css-classes="[cssClass]"
+    :css-classes="['suggest-gitlab-ci-yml', 'ml-4']"
   >
     <template #title>
-      <gl-button :aria-label="__('Close')" class="btn-blank float-right" @click="onDismiss">
-        <gl-icon name="close" aria-hidden="true" />
-      </gl-button>
-      {{ suggestTitle }}
+      <span v-html="suggestTitle"></span>
+      <span class="ml-auto">
+        <gl-button :aria-label="__('Close')" class="btn-blank" @click="onDismiss">
+          <gl-icon name="close" aria-hidden="true" />
+        </gl-button>
+      </span>
     </template>
     <gl-sprintf :message="suggestContent">

app/assets/javascripts/blob/suggest_gitlab_ci_yml/index.js

@@ -8,7 +8,7 @@ export default el =>
       return createElement(Popover, {
         props: {
           target: el.dataset.target,
-          cssClass: el.dataset.cssClass,
+          trackLabel: el.dataset.trackLabel,
           dismissKey: el.dataset.dismissKey,
         },
       });

app/assets/javascripts/blob_edit/blob_bundle.js

@@ -4,11 +4,13 @@ import $ from 'jquery';
 import NewCommitForm from '../new_commit_form';
 import EditBlob from './edit_blob';
 import BlobFileDropzone from '../blob/blob_file_dropzone';
+import initPopover from '~/blob/suggest_gitlab_ci_yml';
 export default () => {
   const editBlobForm = $('.js-edit-blob-form');
   const uploadBlobForm = $('.js-upload-blob-form');
   const deleteBlobForm = $('.js-delete-blob-form');
+  const suggestEl = document.querySelector('.js-suggest-gitlab-ci-yml');
   if (editBlobForm.length) {
     const urlRoot = editBlobForm.data('relativeUrlRoot');
@@ -56,4 +58,8 @@ export default () => {
   if (deleteBlobForm.length) {
     new NewCommitForm(deleteBlobForm);
   }
+
+  if (suggestEl) {
+    initPopover(suggestEl);
+  }
 };

app/assets/javascripts/groups/components/group_item.vue

@@ -95,7 +95,7 @@ export default {
   <li :id="groupDomId" :class="rowClass" class="group-row" @click.stop="onClickRowGroup">
     <div
       :class="{ 'project-row-contents': !isGroup }"
-      class="group-row-contents d-flex align-items-center py-2"
+      class="group-row-contents d-flex align-items-center py-2 pr-3"
     >
       <div class="folder-toggle-wrap append-right-4 d-flex align-items-center">
         <item-caret :is-group-open="group.isOpen" />
@@ -103,8 +103,8 @@ export default {
       </div>
       <gl-loading-icon
         v-if="group.isChildrenLoading"
-        size="md"
-        class="d-none d-sm-inline-flex flex-shrink-0 append-right-10"
+        size="lg"
+        class="d-none d-sm-inline-flex flex-shrink-0 append-right-8"
       />
       <div
         :class="{ 'd-sm-flex': !group.isChildrenLoading }"

app/assets/javascripts/groups/components/item_actions.vue

@@ -68,7 +68,7 @@ export default {
       data-placement="bottom"
       class="edit-group btn btn-xs no-expand"
     >
-      <icon name="settings" class="position-top-0" />
+      <icon name="settings" class="position-top-0 align-middle" />
     </a>
   </div>
 </template>

app/assets/stylesheets/components/popover.scss

@@ -144,9 +144,7 @@
   .popover-header {
     padding: $gl-padding;
-
-    .ic-close {
-      margin-top: -1em;
-    }
+    display: flex;
+    align-items: center;
   }
 }

app/services/clusters/applications/base_helm_service.rb

@@ -50,7 +50,7 @@ module Clusters
       end
       def helm_api
-        @helm_api ||= Gitlab::Kubernetes::Helm::Api.new(kubeclient)
+        @helm_api ||= Gitlab::Kubernetes::Helm::API.new(kubeclient)
       end
       def install_command

app/views/projects/_commit_button.html.haml

 .form-actions
-  = button_tag 'Commit changes', class: 'btn commit-btn js-commit-button btn-success qa-commit-button'
+  = button_tag 'Commit changes', id: 'commit-changes', class: 'btn commit-btn js-commit-button btn-success qa-commit-button'
+
   = link_to 'Cancel', cancel_path,
             class: 'btn btn-cancel', data: {confirm: leave_edit_message}

app/views/projects/blob/_editor.html.haml

@@ -20,7 +20,10 @@
         required: true, class: 'form-control new-file-name js-file-path-name-input', value: params[:file_name] || (should_suggest_gitlab_ci_yml? ? '.gitlab-ci.yml' : '')
       = render 'template_selectors'
       - if should_suggest_gitlab_ci_yml?
-        = render partial: 'suggest_gitlab_ci_yml', locals: { target: '#gitlab-ci-yml-selector', dismiss_key: "suggest_gitlab_ci_yml_#{@project.id}" }
+        .js-suggest-gitlab-ci-yml{ data: { toggle: 'popover',
+          target: '#gitlab-ci-yml-selector',
+          track_label: 'suggest_gitlab_ci_yml',
+          dismiss_key: "suggest_gitlab_ci_yml_#{@project.id}" } }
     .file-buttons
       - if is_markdown

app/views/projects/blob/_suggest_gitlab_ci_yml.html.haml

-.js-suggest-gitlab-ci-yml{ data: { toggle: 'popover',
-  target: target,
-  css_class: 'suggest-gitlab-ci-yml ml-4',
-  dismiss_key: dismiss_key } }

app/views/projects/blob/new.html.haml

@@ -13,3 +13,8 @@
     = hidden_field_tag 'content', '', id: 'file-content'
     = render 'projects/commit_button', ref: @ref,
               cancel_path: project_tree_path(@project, @id)
+    - if should_suggest_gitlab_ci_yml?
+      .js-suggest-gitlab-ci-yml-commit-changes{ data: { toggle: 'popover',
+        target: '#commit-changes',
+        track_label: 'suggest_commit_first_project_gitlab_ci_yml',
+        dismiss_key: "suggest_commit_first_project_gitlab_ci_yml_#{@project.id}" } }

changelogs/unreleased/creator-pairing-group-list-padding.yml

+---
+title: Added a padding-right to items in subgroup list
+merge_request: 26791
+author:
+type: fixed

db/migrate/20200309105539_add_index_services_on_template.rb

+# frozen_string_literal: true
+
+class AddIndexServicesOnTemplate < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  # This migration is a corrective action to add the missing
+  # index_services_on_template index on staging.
+  def up
+    add_concurrent_index(:services, :template) unless index_exists?(:services, :template)
+  end
+
+  def down
+    # No reverse action as this is a corrective migration.
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_03_06_170531) do
+ActiveRecord::Schema.define(version: 2020_03_09_105539) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"

doc/development/pipelines.md

@@ -91,7 +91,8 @@ and are as follows:
 1. For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
 1. For tags, create a pipeline.
 1. If `$GITLAB_INTERNAL` isn't set, don't create a pipeline.
-   1. For stable, auto-deploy, and security branches, create a pipeline.
+1. For stable, auto-deploy, and security branches, create a pipeline.
+1. For any other cases (e.g. when pushing a branch with no MR for it), no pipeline is created.
 ## `rules`, `if:` conditions and `changes:` patterns

doc/development/testing_guide/end_to_end/index.md

@@ -183,6 +183,7 @@ Continued reading:
 - [Best Practices](best_practices.md)
 - [Testing with feature flags](feature_flags.md)
 - [Flows](flows.md)
+- [RSpec metadata/tags](rspec_metadata_tests.md)
 ## Where can I ask for help?

doc/development/testing_guide/end_to_end/rspec_metadata_tests.md

+# RSpec metadata for end-to-end tests
+
+This is a partial list of the [RSpec metadata](https://relishapp.com/rspec/rspec-core/docs/metadata/user-defined-metadata)
+(a.k.a. tags) that are used in our end-to-end tests.
+
+<!-- Please keep the tags in alphabetical order -->
+
+| Tag | Description |
+|-|-|
+| `:elasticsearch` | The test requires an Elasticsearch service. It is used by the [instance-level scenario](https://gitlab.com/gitlab-org/gitlab-qa#definitions) [`Test::Integration::Elasticsearch`](https://gitlab.com/gitlab-org/gitlab/-/blob/72b62b51bdf513e2936301cb6c7c91ec27c35b4d/qa/qa/ee/scenario/test/integration/elasticsearch.rb) to include only tests that require Elasticsearch. |
+| `:orchestrated` | The GitLab instance under test may be [configured by `gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/docs/what_tests_can_be_run.md#orchestrated-tests) to be different to the default GitLab configuration, or `gitlab-qa` may launch additional services in separate docker containers, or both. Tests tagged with `:orchestrated` are excluded when testing environments where we can't dynamically modify GitLab's configuration (for example, Staging). |
+| `:quarantine` | The test has been [quarantined](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests), will run in a separate job that only includes quarantined tests, and is allowed to fail. The test will be skipped in its regular job so that if it fails it will not hold up the pipeline. |
+| `:requires_admin` | The test requires an admin account. Tests with the tag are excluded when run against Canary and Production environments. |

doc/security/unlock_user.md

@@ -4,7 +4,7 @@ type: howto
 # How to unlock a locked user from the command line
-After six failed login attempts a user gets in a locked state.
+After ten failed login attempts a user gets in a locked state.
 To unlock a locked user:

doc/topics/autodevops/index.md

@@ -744,9 +744,9 @@ workers:
 By default, all Kubernetes pods are
 [non-isolated](https://kubernetes.io/docs/concepts/services-networking/network-policies/#isolated-and-non-isolated-pods),
-and accept traffic from any source. You can use
+meaning that they will accept traffic to and from any source. You can use
 [NetworkPolicy](https://kubernetes.io/docs/concepts/services-networking/network-policies/)
-to restrict connections to selected pods or namespaces.
+to restrict connections to and from selected pods, namespaces, and the Internet.
 NOTE: **Note:**
 You must use a Kubernetes network plugin that implements support for
@@ -767,7 +767,7 @@ networkPolicy:
 The default policy deployed by the auto deploy pipeline will allow
 traffic within a local namespace and from the `gitlab-managed-apps`
 namespace. All other inbound connection will be blocked. Outbound
-traffic is not affected by the default policy.
+traffic (for example, to the Internet) is not affected by the default policy.
 You can also provide a custom [policy specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.16/#networkpolicyspec-v1-networking-k8s-io)
 via the `.gitlab/auto-deploy-values.yaml` file, for example:
@@ -788,6 +788,9 @@ networkPolicy:
             app.gitlab.com/managed_by: gitlab
 ```
+For more information on how to install Network Policies, see
+[Install Cilium using GitLab CI](../../user/clusters/applications.md#install-cilium-using-gitlab-ci).
+
 #### Web Application Firewall (ModSecurity) customization
 > [Introduced](https://gitlab.com/gitlab-org/charts/auto-deploy-app/-/merge_requests/44) in GitLab 12.8.