Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 8 deletions

diff --git a/doc/api/deploy_keys.md b/doc/api/deploy_keys.md
index 5ec1fa6c040..7bf9fb0827a 100644
--- a/doc/api/deploy_keys.md
+++ b/doc/api/deploy_keys.md
@@ -43,6 +43,7 @@ Example response:
     "fingerprint": "4a:9d:64:15:ed:3a:e6:07:6e:89:36:b3:3b:03:05:d9",
     "fingerprint_sha256": "SHA256:Jrs3LD1Ji30xNLtTVf9NDCj7kkBgPBb2pjvTZ3HfIgU",
     "created_at": "2013-10-02T10:12:29Z",
+    "expires_at": null,
     "projects_with_write_access": [
       {
         "id": 73,
@@ -71,6 +72,7 @@ Example response:
     "fingerprint": "0b:cf:58:40:b9:23:96:c7:ba:44:df:0e:9e:87:5e:75",
     "fingerprint_sha256": "SHA256:lGI/Ys/Wx7PfMhUO1iuBH92JQKYN+3mhJZvWO4Q5ims",
     "created_at": "2013-10-02T11:12:29Z",
+    "expires_at": null,
     "projects_with_write_access": []
   }
 ]
@@ -103,6 +105,7 @@ Example response:
     "fingerprint": "4a:9d:64:15:ed:3a:e6:07:6e:89:36:b3:3b:03:05:d9",
     "fingerprint_sha256": "SHA256:Jrs3LD1Ji30xNLtTVf9NDCj7kkBgPBb2pjvTZ3HfIgU",
     "created_at": "2013-10-02T10:12:29Z",
+    "expires_at": null,
     "can_push": false
   },
   {
@@ -112,6 +115,7 @@ Example response:
     "fingerprint": "0b:cf:58:40:b9:23:96:c7:ba:44:df:0e:9e:87:5e:75",
     "fingerprint_sha256": "SHA256:lGI/Ys/Wx7PfMhUO1iuBH92JQKYN+3mhJZvWO4Q5ims",
     "created_at": "2013-10-02T11:12:29Z",
+    "expires_at": null,
     "can_push": false
   }
 ]
@@ -205,6 +209,7 @@ Example response:
   "fingerprint": "4a:9d:64:15:ed:3a:e6:07:6e:89:36:b3:3b:03:05:d9",
   "fingerprint_sha256": "SHA256:Jrs3LD1Ji30xNLtTVf9NDCj7kkBgPBb2pjvTZ3HfIgU",
   "created_at": "2013-10-02T10:12:29Z",
+  "expires_at": null,
   "can_push": false
 }
 ```
@@ -220,12 +225,13 @@ project only if the original one is accessible by the same user.
 POST /projects/:id/deploy_keys
 ```
 
-| Attribute  | Type | Required | Description |
-| ---------  | ---- | -------- | ----------- |
-| `id`       | integer/string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding) owned by the authenticated user |
-| `title`    | string  | yes | New deploy key's title |
-| `key`      | string  | yes | New deploy key |
-| `can_push` | boolean | no  | Can deploy key push to the project's repository |
+| Attribute    | Type | Required | Description |
+| -----------  | ---- | -------- | ----------- |
+| `id`         | integer/string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding) owned by the authenticated user |
+| `title`      | string   | yes | New deploy key's title |
+| `key`        | string   | yes | New deploy key |
+| `expires_at` | datetime | no | Expiration date for the deploy key. Does not expire if no value is provided. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`) |
+| `can_push`   | boolean  | no  | Can deploy key push to the project's repository |
 
 ```shell
 curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" --header "Content-Type: application/json" \
@@ -241,7 +247,8 @@ Example response:
    "id" : 12,
    "title" : "My deploy key",
    "can_push": true,
-   "created_at" : "2015-08-29T12:44:31.550Z"
+   "created_at" : "2015-08-29T12:44:31.550Z",
+   "expires_at": null
 }
 ```
 
@@ -272,6 +279,7 @@ Example response:
    "title": "New deploy key",
    "key": "ssh-rsa AAAA...",
    "created_at": "2015-08-29T12:44:31.550Z",
+   "expires_at": null,
    "can_push": true
 }
 ```
@@ -317,7 +325,8 @@ Example response:
    "key" : "ssh-rsa AAAA...",
    "id" : 12,
    "title" : "My deploy key",
-   "created_at" : "2015-08-29T12:44:31.550Z"
+   "created_at" : "2015-08-29T12:44:31.550Z",
+   "expires_at": null
 }
 ```
 
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 61b7f623660..b85405823e6 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -22998,6 +22998,7 @@ Available fields to be exported as CSV.
 | <a id="availableexportfieldsauthor"></a>`AUTHOR` | Author name. |
 | <a id="availableexportfieldsauthor_username"></a>`AUTHOR_USERNAME` | Author username. |
 | <a id="availableexportfieldscreated_at"></a>`CREATED_AT` | Date of creation. |
+| <a id="availableexportfieldsdescription"></a>`DESCRIPTION` | Description. |
 | <a id="availableexportfieldsid"></a>`ID` | Unique identifier. |
 | <a id="availableexportfieldstitle"></a>`TITLE` | Title. |
 | <a id="availableexportfieldstype"></a>`TYPE` | Type of the work item. |