Add latest changes from gitlab-org/gitlab@master

db/migrate/20200306170321_add_index_on_user_id_and_created_at_to_ci_pipelines.rb

+# frozen_string_literal: true
+
+class AddIndexOnUserIdAndCreatedAtToCiPipelines < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :ci_pipelines, [:user_id, :created_at]
+    remove_concurrent_index :ci_pipelines, [:user_id]
+  end
+
+  def down
+    add_concurrent_index :ci_pipelines, [:user_id]
+    remove_concurrent_index :ci_pipelines, [:user_id, :created_at]
+  end
+end

db/schema.rb

@@ -873,7 +873,7 @@ ActiveRecord::Schema.define(version: 2020_03_09_195710) do
     t.index ["project_id", "status", "config_source"], name: "index_ci_pipelines_on_project_id_and_status_and_config_source"
     t.index ["project_id", "status", "updated_at"], name: "index_ci_pipelines_on_project_id_and_status_and_updated_at"
     t.index ["status"], name: "index_ci_pipelines_on_status"
-    t.index ["user_id"], name: "index_ci_pipelines_on_user_id"
+    t.index ["user_id", "created_at"], name: "index_ci_pipelines_on_user_id_and_created_at"
   end
   create_table "ci_pipelines_config", primary_key: "pipeline_id", force: :cascade do |t|

doc/api/graphql/reference/gitlab_schema.graphql

@@ -2219,6 +2219,61 @@ type Epic implements Noteable {
   webUrl: String!
 }
+"""
+Autogenerated input type of EpicAddIssue
+"""
+input EpicAddIssueInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The group the epic to mutate belongs to
+  """
+  groupPath: ID!
+
+  """
+  The iid of the epic to mutate
+  """
+  iid: ID!
+
+  """
+  The iid of the issue to be added
+  """
+  issueIid: String!
+
+  """
+  The project the issue belongs to
+  """
+  projectPath: ID!
+}
+
+"""
+Autogenerated return type of EpicAddIssue
+"""
+type EpicAddIssuePayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The epic after mutation
+  """
+  epic: Epic
+
+  """
+  The epic-issue relation
+  """
+  epicIssue: EpicIssue
+
+  """
+  Reasons why the mutation failed.
+  """
+  errors: [String!]!
+}
+
 """
 The connection type for Epic.
 """
@@ -2689,7 +2744,7 @@ input EpicSetSubscriptionInput {
   clientMutationId: String
   """
-  The group the epic to mutate is in
+  The group the epic to mutate belongs to
   """
   groupPath: ID!
@@ -4872,6 +4927,7 @@ type Mutation {
   designManagementUpload(input: DesignManagementUploadInput!): DesignManagementUploadPayload
   destroyNote(input: DestroyNoteInput!): DestroyNotePayload
   destroySnippet(input: DestroySnippetInput!): DestroySnippetPayload
+  epicAddIssue(input: EpicAddIssueInput!): EpicAddIssuePayload
   epicSetSubscription(input: EpicSetSubscriptionInput!): EpicSetSubscriptionPayload
   epicTreeReorder(input: EpicTreeReorderInput!): EpicTreeReorderPayload
   issueSetConfidential(input: IssueSetConfidentialInput!): IssueSetConfidentialPayload

doc/api/graphql/reference/gitlab_schema.json

@@ -19402,6 +19402,33 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "epicAddIssue",
+              "description": null,
+              "args": [
+                {
+                  "name": "input",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "EpicAddIssueInput",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "EpicAddIssuePayload",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "epicSetSubscription",
               "description": null,
@@ -25120,7 +25147,7 @@
             },
             {
               "name": "groupPath",
-              "description": "The group the epic to mutate is in",
+              "description": "The group the epic to mutate belongs to",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -25161,6 +25188,164 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "EpicAddIssuePayload",
+          "description": "Autogenerated return type of EpicAddIssue",
+          "fields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "epic",
+              "description": "The epic after mutation",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Epic",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "epicIssue",
+              "description": "The epic-issue relation",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "EpicIssue",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "errors",
+              "description": "Reasons why the mutation failed.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "EpicAddIssueInput",
+          "description": "Autogenerated input type of EpicAddIssue",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "iid",
+              "description": "The iid of the epic to mutate",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ID",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "groupPath",
+              "description": "The group the epic to mutate belongs to",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ID",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "projectPath",
+              "description": "The project the issue belongs to",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ID",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "issueIid",
+              "description": "The iid of the issue to be added",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "__Schema",

doc/api/graphql/reference/index.md

@@ -346,6 +346,17 @@ Represents an epic.
 | `webPath` | String! | Web path of the epic |
 | `webUrl` | String! | Web URL of the epic |
+## EpicAddIssuePayload
+
+Autogenerated return type of EpicAddIssue
+
+| Name  | Type  | Description |
+| ---   |  ---- | ----------  |
+| `clientMutationId` | String | A unique identifier for the client performing the mutation. |
+| `epic` | Epic | The epic after mutation |
+| `epicIssue` | EpicIssue | The epic-issue relation |
+| `errors` | String! => Array | Reasons why the mutation failed. |
+
 ## EpicDescendantCount
 Counts of descendent epics.

doc/ci/jenkins/index.md

@@ -24,12 +24,40 @@ can be a great resource.
 There are some high level differences between the products worth mentioning:
 - With GitLab you don't need a root `pipeline` keyword to wrap everything.
+- The way pipelines are triggered and [trigger other pipelines](../yaml/README.md#trigger)
+  is different than Jenkins. GitLab pipelines can be triggered:
+
+  - on push
+  - on [schedule](../pipelines/schedules.md)
+  - from the [GitLab UI](../pipelines.md#manually-executing-pipelines)
+  - by [API call](../triggers/README.md)
+  - by [webhook](../triggers/README.md#triggering-a-pipeline-from-a-webhook)
+  - by [ChatOps](../chatops/README.md)
+
+  You can control which jobs run in which cases, depending on how they are triggered,
+  with the [`rules` syntax](../yaml/README.md#rules).
+- GitLab [pipeline scheduling concepts](../pipelines/schedules.md) are also different than with Jenkins.
 - All jobs within a single stage always run in parallel, and all stages run in sequence. We are planning
   to allow certain jobs to break this sequencing as needed with our [directed acyclic graph](https://gitlab.com/gitlab-org/gitlab-foss/issues/47063)
   feature.
+- The [`parallel`](../yaml/README.md#parallel) keyword can automatically parallelize tasks,
+  like tests that support parallelization.
+- Normally all jobs within a single stage run in parallel, and all stages run in sequence.
+  There are different [pipeline architectures](../pipelines/pipeline_architectures.md)
+  that allow you to change this behavior.
+- The new [`rules` syntax](../yaml/README.md#rules) is the recommended method of
+  controlling when different jobs run. It is more powerful than the `only/except` syntax.
+- One important difference is that jobs run independently of each other and have a
+  fresh environment in each job. Passing artifacts between jobs is controlled using the
+  [`artifacts`](../yaml/README.md#artifacts) and [`dependencies`](../yaml/README.md#dependencies)
+  keywords. When finished, the planned [Workspaces](https://gitlab.com/gitlab-org/gitlab/issues/29265)
+  feature will allow you to more easily persist a common workspace between serial jobs.
 - The `.gitlab-ci.yml` file is checked in to the root of your repository, much like a Jenkinsfile, but
   is in the YAML format (see [complete reference](../yaml/README.md)) instead of a Groovy DSL. It's most
   analogous to the declarative Jenkinsfile format.
+- Manual approvals or gates can be set up as [`when:manual` jobs](../yaml/README.md#whenmanual). These can
+  also leverage [`protected environments`](../yaml/README.md#protecting-manual-jobs-premium)
+  to control who is able to approve them.
 - GitLab comes with a [container registry](../../user/packages/container_registry/index.md), and we recommend using
   container images to set up your build environment.
 - Totally stuck and not sure where to turn for advice? The [GitLab community forum](https://forum.gitlab.com/) can be a great resource.

locale/gitlab.pot

@@ -18771,6 +18771,45 @@ msgstr ""
 msgid "Status: %{title}"
 msgstr ""
+msgid "StatusPage|AWS Secret access key"
+msgstr ""
+
+msgid "StatusPage|AWS access key ID"
+msgstr ""
+
+msgid "StatusPage|AWS documentation"
+msgstr ""
+
+msgid "StatusPage|AWS region"
+msgstr ""
+
+msgid "StatusPage|Active"
+msgstr ""
+
+msgid "StatusPage|Bucket %{docsLink}"
+msgstr ""
+
+msgid "StatusPage|Configure file storage settings to link issues in this project to an external status page."
+msgstr ""
+
+msgid "StatusPage|For help with configuration, visit %{docsLink}"
+msgstr ""
+
+msgid "StatusPage|S3 Bucket name"
+msgstr ""
+
+msgid "StatusPage|Status page"
+msgstr ""
+
+msgid "StatusPage|To publish incidents to an external status page, GitLab will store a JSON file in your Amazon S3 account in a location accessible to your external status page service. Make sure to also set up %{docsLink}"
+msgstr ""
+
+msgid "StatusPage|configuration documentation"
+msgstr ""
+
+msgid "StatusPage|your status page frontend."
+msgstr ""
+
 msgid "Stay updated about the performance and health of your environment by configuring Prometheus to monitor your deployments."
 msgstr ""
@@ -20819,6 +20858,9 @@ msgstr ""
 msgid "Total issues"
 msgstr ""
+msgid "Total memory (GB)"
+msgstr ""
+
 msgid "Total test time for all commits/merges"
 msgstr ""

spec/frontend/clusters_list/mock_data.js

@@ -5,6 +5,7 @@ export default [
     size: '3',
     clusterType: 'group_type',
     status: 'disabled',
+    memory: '22.50 (30% free)',
   },
   {
     name: 'My Cluster 2',
@@ -12,6 +13,7 @@ export default [
     size: '12',
     clusterType: 'project_type',
     status: 'unreachable',
+    memory: '11 (60% free)',
   },
   {
     name: 'My Cluster 3',
@@ -19,6 +21,7 @@ export default [
     size: '12',
     clusterType: 'project_type',
     status: 'authentication_failure',
+    memory: '22 (33% free)',
   },
   {
     name: 'My Cluster 4',
@@ -26,6 +29,7 @@ export default [
     size: '12',
     clusterType: 'project_type',
     status: 'deleting',
+    memory: '45 (15% free)',
   },
   {
     name: 'My Cluster 5',
@@ -33,5 +37,6 @@ export default [
     size: '12',
     clusterType: 'project_type',
     status: 'connected',
+    memory: '20.12 (35% free)',
   },
 ];

spec/frontend/lib/utils/datetime_utility_spec.js

@@ -474,6 +474,23 @@ describe('getDateInFuture', () => {
   });
 });
+describe('isValidDate', () => {
+  it.each`
+    valueToCheck                              | isValid
+    ${new Date()}                             | ${true}
+    ${new Date('December 17, 1995 03:24:00')} | ${true}
+    ${new Date('1995-12-17T03:24:00')}        | ${true}
+    ${new Date('foo')}                        | ${false}
+    ${5}                                      | ${false}
+    ${''}                                     | ${false}
+    ${false}                                  | ${false}
+    ${undefined}                              | ${false}
+    ${null}                                   | ${false}
+  `('returns $expectedReturnValue when called with $dateToCheck', ({ valueToCheck, isValid }) => {
+    expect(datetimeUtility.isValidDate(valueToCheck)).toBe(isValid);
+  });
+});
+
 describe('getDatesInRange', () => {
   it('returns an empty array if 1st or 2nd argument is not a Date object', () => {
     const d1 = new Date('2019-01-01');

spec/lib/gitlab/project_authorizations_spec.rb

@@ -43,6 +43,78 @@ describe Gitlab::ProjectAuthorizations do
     end
   end
+  context 'unapproved access request' do
+    let_it_be(:group) { create(:group) }
+    let_it_be(:user) { create(:user) }
+
+    subject(:mapping) { map_access_levels(authorizations) }
+
+    context 'group membership' do
+      let!(:group_project) { create(:project, namespace: group) }
+
+      before do
+        create(:group_member, :developer, :access_request, user: user, group: group)
+      end
+
+      it 'does not create authorization' do
+        expect(mapping[group_project.id]).to be_nil
+      end
+    end
+
+    context 'inherited group membership' do
+      let!(:sub_group) { create(:group, parent: group) }
+      let!(:sub_group_project) { create(:project, namespace: sub_group) }
+
+      before do
+        create(:group_member, :developer, :access_request, user: user, group: group)
+      end
+
+      it 'does not create authorization' do
+        expect(mapping[sub_group_project.id]).to be_nil
+      end
+    end
+
+    context 'project membership' do
+      let!(:group_project) { create(:project, namespace: group) }
+
+      before do
+        create(:project_member, :developer, :access_request, user: user, project: group_project)
+      end
+
+      it 'does not create authorization' do
+        expect(mapping[group_project.id]).to be_nil
+      end
+    end
+
+    context 'shared group' do
+      let!(:shared_group) { create(:group) }
+      let!(:shared_group_project) { create(:project, namespace: shared_group) }
+
+      before do
+        create(:group_group_link, shared_group: shared_group, shared_with_group: group)
+        create(:group_member, :developer, :access_request, user: user, group: group)
+      end
+
+      it 'does not create authorization' do
+        expect(mapping[shared_group_project.id]).to be_nil
+      end
+    end
+
+    context 'shared project' do
+      let!(:another_group) { create(:group) }
+      let!(:shared_project) { create(:project, namespace: another_group) }
+
+      before do
+        create(:project_group_link, group: group, project: shared_project)
+        create(:group_member, :developer, :access_request, user: user, group: group)
+      end
+
+      it 'does not create authorization' do
+        expect(mapping[shared_project.id]).to be_nil
+      end
+    end
+  end
+
   context 'with nested groups' do
     let(:group) { create(:group) }
     let!(:nested_group) { create(:group, parent: group) }