diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 21:08:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 21:08:54 +0300 |
commit | 0d6fa033121a9bef708b8f2de186c4034c61d4a3 (patch) | |
tree | 851d65a09efbffa114c9a273e590d55cfb1436ab /doc | |
parent | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/geo/replication/troubleshooting.md | 2 | ||||
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.graphql | 5 | ||||
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.json | 18 | ||||
-rw-r--r-- | doc/api/graphql/reference/index.md | 1 | ||||
-rw-r--r-- | doc/user/project/settings/import_export.md | 2 |
5 files changed, 26 insertions, 2 deletions
diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md index 1a4c37dc709..0e13508a3cd 100644 --- a/doc/administration/geo/replication/troubleshooting.md +++ b/doc/administration/geo/replication/troubleshooting.md @@ -727,7 +727,7 @@ For example: Geo database has an outdated FDW remote schema. It contains 229 of 236 expected tables. Please refer to Geo Troubleshooting. ``` -To resolve this, run the following command: +To resolve this, run the following command on the **secondary**: ```shell sudo gitlab-rake geo:db:refresh_foreign_tables diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index e04bb0fc13e..125009adc35 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -5832,6 +5832,11 @@ type ProjectPermissions { readDesign: Boolean! """ + Indicates the user can perform `read_merge_request` on this resource + """ + readMergeRequest: Boolean! + + """ Indicates the user can perform `read_pages_content` on this resource """ readPagesContent: Boolean! diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index 92e421eb53c..17a3d8eb2e2 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -2254,6 +2254,24 @@ "deprecationReason": null }, { + "name": "readMergeRequest", + "description": "Indicates the user can perform `read_merge_request` on this resource", + "args": [ + + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "Boolean", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { "name": "readPagesContent", "description": "Indicates the user can perform `read_pages_content` on this resource", "args": [ diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 00c610b9eb7..beffd29d884 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -867,6 +867,7 @@ Information about pagination in a connection. | `readCommitStatus` | Boolean! | Indicates the user can perform `read_commit_status` on this resource | | `readCycleAnalytics` | Boolean! | Indicates the user can perform `read_cycle_analytics` on this resource | | `readDesign` | Boolean! | Indicates the user can perform `read_design` on this resource | +| `readMergeRequest` | Boolean! | Indicates the user can perform `read_merge_request` on this resource | | `readPagesContent` | Boolean! | Indicates the user can perform `read_pages_content` on this resource | | `readProject` | Boolean! | Indicates the user can perform `read_project` on this resource | | `readProjectMember` | Boolean! | Indicates the user can perform `read_project_member` on this resource | diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md index c4a4f4f14ee..249e1cd25e5 100644 --- a/doc/user/project/settings/import_export.md +++ b/doc/user/project/settings/import_export.md @@ -26,7 +26,7 @@ Note the following: and are deleted every 24 hours by a specific worker. - Group members are exported as project members, as long as the user has maintainer or admin access to the group where the exported project lives. An admin - in the import side is required to map the users, based on email or username. + in the import side is required to map the users, based on email. Otherwise, a supplementary comment is left to mention the original author and the MRs, notes, or issues will be owned by the importer. - Project members with owner access will be imported as maintainers. |