Add latest changes from gitlab-org/gitlab@master

5 files changed, 75 insertions, 1 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 17de12381be..749461b5e9e 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -341,6 +341,11 @@ type BoardList {
   label: Label
 
   """
+  The current limit metric for the list
+  """
+  limitMetric: ListLimitMetric
+
+  """
   Type of the list
   """
   listType: String!
@@ -4620,6 +4625,15 @@ type LabelEdge {
 }
 
 """
+List limit metric setting
+"""
+enum ListLimitMetric {
+  all_metrics
+  issue_count
+  issue_weights
+}
+
+"""
 Autogenerated input type of MarkAsSpamSnippet
 """
 input MarkAsSpamSnippetInput {
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 0e4087794ba..70f9a53244e 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -1037,6 +1037,20 @@
               "deprecationReason": null
             },
             {
+              "name": "limitMetric",
+              "description": "The current limit metric for the list",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "ENUM",
+                "name": "ListLimitMetric",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "listType",
               "description": "Type of the list",
               "args": [
@@ -13172,6 +13186,35 @@
           "possibleTypes": null
         },
         {
+          "kind": "ENUM",
+          "name": "ListLimitMetric",
+          "description": "List limit metric setting",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "all_metrics",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "issue_count",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "issue_weights",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
           "kind": "INPUT_OBJECT",
           "name": "MarkAsSpamSnippetInput",
           "description": "Autogenerated input type of MarkAsSpamSnippet",
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 89cf4e9ab39..af126f48c50 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -89,6 +89,7 @@ Represents a list for an issue board
 | `collapsed` | Boolean | Indicates if list is collapsed for this user |
 | `id` | ID! | ID (global ID) of the list |
 | `label` | Label | Label of the list |
+| `limitMetric` | ListLimitMetric | The current limit metric for the list |
 | `listType` | String! | Type of the list |
 | `maxIssueCount` | Int | Maximum number of issues in the list |
 | `maxIssueWeight` | Int | Maximum weight of issues in the list |
diff --git a/doc/development/application_limits.md b/doc/development/application_limits.md
index ace86e0ded2..b13e2994c52 100644
--- a/doc/development/application_limits.md
+++ b/doc/development/application_limits.md
@@ -90,7 +90,7 @@ project.actual_limits.exceeded?(:project_hooks, 10)
 
 #### `Limitable` concern
 
-The [`Limitable` concern](https://gitlab.com/gitlab-org/gitlab/blob/master/ee/app/models/concerns/limitable.rb)
+The [`Limitable` concern](https://gitlab.com/gitlab-org/gitlab/blob/master/app/models/concerns/limitable.rb)
 can be used to validate that a model does not exceed the limits. It ensures
 that the count of the records for the current model does not exceed the defined
 limit.
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index c9ad462f289..ebd39354cb5 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -533,6 +533,22 @@ Since we're adding our SSL certificate at the load balancer, we do not need GitL
    sudo gitlab-ctl reconfigure
    ```
 
+#### Fast lookup of authorized SSH keys
+
+The public SSH keys for users allowed to access GitLab are stored in `/var/opt/gitlab/.ssh/authorized_keys`. Typically we'd use shared storage so that all the instances are able to access this file when a user performs a Git action over SSH. Since we do not have shared storage in our setup, we'll update our configuration to authorize SSH users via indexed lookup in the GitLab database.
+
+Follow the instructions at [Setting up fast lookup via GitLab Shell](../../administration/operations/fast_ssh_key_lookup.md#setting-up-fast-lookup-via-gitlab-shell) to switch from using the `authorized_keys` file to the database.
+
+If you do not configure fast lookup, Git actions over SSH will result in the following error:
+
+```shell
+Permission denied (publickey).
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+```
+
 #### Configure host keys
 
 Ordinarily we would manually copy the contents (primary and public keys) of `/etc/ssh/` on the primary application server to `/etc/ssh` on all secondary servers. This prevents false man-in-the-middle-attack alerts when accessing servers in your High Availability cluster behind a load balancer.