Add latest changes from gitlab-org/gitlab@master

7 files changed, 40 insertions, 8 deletions

diff --git a/changelogs/unreleased/33896-security-dashboard-projects.yml b/changelogs/unreleased/33896-security-dashboard-projects.yml
new file mode 100644
index 00000000000..9f93e1b3497
--- /dev/null
+++ b/changelogs/unreleased/33896-security-dashboard-projects.yml
@@ -0,0 +1,5 @@
+---
+title: Create a users_security_dashboard_projects table to store the projects a user has added to their personal security dashboard
+merge_request: 18708
+author:
+type: added
diff --git a/db/migrate/20191017001326_create_users_security_dashboard_projects.rb b/db/migrate/20191017001326_create_users_security_dashboard_projects.rb
new file mode 100644
index 00000000000..398401dbee6
--- /dev/null
+++ b/db/migrate/20191017001326_create_users_security_dashboard_projects.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateUsersSecurityDashboardProjects < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+  INDEX_NAME = 'users_security_dashboard_projects_unique_index'
+
+  def change
+    create_table :users_security_dashboard_projects, id: false do |t|
+      t.references :user, null: false, foreign_key: { on_delete: :cascade }
+      t.references :project, null: false, index: false, foreign_key: { on_delete: :cascade }
+    end
+
+    add_index :users_security_dashboard_projects, [:project_id, :user_id], name: INDEX_NAME, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index babe53623f6..35b6dc00de1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3888,6 +3888,13 @@ ActiveRecord::Schema.define(version: 2019_11_05_094625) do
     t.index ["user_id", "project_id"], name: "index_users_ops_dashboard_projects_on_user_id_and_project_id", unique: true
   end
 
+  create_table "users_security_dashboard_projects", id: false, force: :cascade do |t|
+    t.bigint "user_id", null: false
+    t.bigint "project_id", null: false
+    t.index ["project_id", "user_id"], name: "users_security_dashboard_projects_unique_index", unique: true
+    t.index ["user_id"], name: "index_users_security_dashboard_projects_on_user_id"
+  end
+
   create_table "users_star_projects", id: :serial, force: :cascade do |t|
     t.integer "project_id", null: false
     t.integer "user_id", null: false
@@ -4472,6 +4479,8 @@ ActiveRecord::Schema.define(version: 2019_11_05_094625) do
   add_foreign_key "users", "namespaces", column: "managing_group_id", name: "fk_a4b8fefe3e", on_delete: :nullify
   add_foreign_key "users_ops_dashboard_projects", "projects", on_delete: :cascade
   add_foreign_key "users_ops_dashboard_projects", "users", on_delete: :cascade
+  add_foreign_key "users_security_dashboard_projects", "projects", on_delete: :cascade
+  add_foreign_key "users_security_dashboard_projects", "users", on_delete: :cascade
   add_foreign_key "users_star_projects", "projects", name: "fk_22cd27ddfc", on_delete: :cascade
   add_foreign_key "vulnerabilities", "epics", name: "fk_1d37cddf91", on_delete: :nullify
   add_foreign_key "vulnerabilities", "milestones", column: "due_date_sourcing_milestone_id", name: "fk_7c5bb22a22", on_delete: :nullify
diff --git a/doc/development/kubernetes.md b/doc/development/kubernetes.md
index 4a554912e05..a0dd97f2a1c 100644
--- a/doc/development/kubernetes.md
+++ b/doc/development/kubernetes.md
@@ -94,12 +94,12 @@ the provisioning actions. The following resources must be present:
 - A service account with permissions to assume the provisioning
   role in the `Customer` account above.
 - Credentials for this service account configured in GitLab via
-  the `kubernetes` section of `gitlab.yml`
+  the `kubernetes` section of `gitlab.yml`.
 
 The process for creating a cluster is as follows:
 
-1. Using the :provision_role_external_id, GitLab assumes the role provided
-   by :provision_role_arn and stores a set of temporary credentials on the
+1. Using the `:provision_role_external_id`, GitLab assumes the role provided
+   by `:provision_role_arn` and stores a set of temporary credentials on the
    provider record. By default these credentials are valid for one hour.
 1. A CloudFormation stack is created, based on the
    [`AWS CloudFormation EKS template`](https://gitlab.com/gitlab-org/gitlab/blob/master/vendor/aws/cloudformation/eks_cluster.yaml).
@@ -114,9 +114,9 @@ The process for creating a cluster is as follows:
 1. Credentials that are no longer required are removed. This deletes the following
    attributes:
 
-- `access_key_id`
-- `secret_access_key`
-- `session_token`
+   - `access_key_id`
+   - `secret_access_key`
+   - `session_token`
 
 ## Security
 
diff --git a/doc/raketasks/cleanup.md b/doc/raketasks/cleanup.md
index 67bf7cbd828..937f15554b4 100644
--- a/doc/raketasks/cleanup.md
+++ b/doc/raketasks/cleanup.md
@@ -88,7 +88,7 @@ gitlab-rake gitlab:cleanup:orphan_job_artifact_files DRY_RUN=false
 You can also limit the number of files to delete with `LIMIT`:
 
 ```shell
-gitlab-rake gitlab:cleanup:orphan_job_artifact_files LIMIT=100`
+gitlab-rake gitlab:cleanup:orphan_job_artifact_files LIMIT=100
 ```
 
 This will only delete up to 100 files from disk. You can use this to
diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md
index 8ec3d5fe36e..ce3a3dd5ca6 100644
--- a/doc/topics/autodevops/quick_start_guide.md
+++ b/doc/topics/autodevops/quick_start_guide.md
@@ -25,7 +25,7 @@ Google account (for example, one that you use to access Gmail, Drive, etc.) or c
 TIP: **Tip:**
 Every new Google Cloud Platform (GCP) account receives [$300 in credit](https://console.cloud.google.com/freetrial),
 and 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. All you have to do is [follow this link](https://cloud.google.com/partners/partnercredit/?PCN=a0n60000006Vpz4AAC) and apply for credit.
+Google Kubernetes Engine Integration. All you have to do is [follow this link](https://cloud.google.com/partners/partnercredit/?pcn_code=0014M00001h35gDQAQ#contact-form) and apply for credit.
 
 ## Creating a new project from a template
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 4207deb3dfb..2a18ebf8d97 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -20300,6 +20300,9 @@ msgstr ""
 msgid "leave %{group_name}"
 msgstr ""
 
+msgid "limit of %{project_limit} reached"
+msgstr ""
+
 msgid "locked by %{path_lock_user_name} %{created_at}"
 msgstr ""