diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 15:07:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 15:07:48 +0300 |
commit | ef31adeb0fb9a02b2c6a4529ec4e38d7082a4b2b (patch) | |
tree | f0ee2b8bdffd7f91ad0b31388562c90825179585 /doc | |
parent | 7e019504f5ac6decde690565857238e7e59aa034 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.graphql | 89 | ||||
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.json | 250 | ||||
-rw-r--r-- | doc/api/graphql/reference/index.md | 11 | ||||
-rw-r--r-- | doc/development/architecture.md | 25 | ||||
-rw-r--r-- | doc/user/project/issues/design_management.md | 27 |
5 files changed, 376 insertions, 26 deletions
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index 0fbd8c84e58..9766fc39e2e 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -63,6 +63,11 @@ input AdminSidekiqQueuesDeleteJobsInput { queueName: String! """ + Delete jobs matching related_class in the context metadata + """ + relatedClass: String + + """ Delete jobs matching root_namespace in the context metadata """ rootNamespace: String @@ -4093,6 +4098,58 @@ Represents untyped JSON """ scalar JSON +type JiraImport { + """ + Project key for the imported Jira project + """ + jiraProjectKey: String! + + """ + Timestamp of when the Jira import was created/started + """ + scheduledAt: Time + + """ + User that started the Jira import + """ + scheduledBy: User +} + +""" +The connection type for JiraImport. +""" +type JiraImportConnection { + """ + A list of edges. + """ + edges: [JiraImportEdge] + + """ + A list of nodes. + """ + nodes: [JiraImport] + + """ + Information to aid in pagination. + """ + pageInfo: PageInfo! +} + +""" +An edge in a connection. +""" +type JiraImportEdge { + """ + A cursor for use in pagination. + """ + cursor: String! + + """ + The item at the end of the edge. + """ + node: JiraImport +} + type Label { """ Background color of the label @@ -5749,7 +5806,7 @@ type Project { id: ID! """ - Status of project import background job of the project + Status of import background job of the project """ importStatus: String @@ -5939,6 +5996,36 @@ type Project { issuesEnabled: Boolean """ + Status of Jira import background job of the project + """ + jiraImportStatus: String + + """ + Jira imports into the project + """ + jiraImports( + """ + Returns the elements in the list that come after the specified cursor. + """ + after: String + + """ + Returns the elements in the list that come before the specified cursor. + """ + before: String + + """ + Returns the first _n_ elements from the list. + """ + first: Int + + """ + Returns the last _n_ elements from the list. + """ + last: Int + ): JiraImportConnection + + """ (deprecated) Enable jobs for this project. Use `builds_access_level` instead """ jobsEnabled: Boolean diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index bd78b51684f..7584e48b1e5 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -182,6 +182,16 @@ "defaultValue": null }, { + "name": "relatedClass", + "description": "Delete jobs matching related_class in the context metadata", + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "defaultValue": null + }, + { "name": "queueName", "description": "The name of the queue to delete jobs from", "type": { @@ -11613,6 +11623,177 @@ }, { "kind": "OBJECT", + "name": "JiraImport", + "description": null, + "fields": [ + { + "name": "jiraProjectKey", + "description": "Project key for the imported Jira project", + "args": [ + + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "scheduledAt", + "description": "Timestamp of when the Jira import was created/started", + "args": [ + + ], + "type": { + "kind": "SCALAR", + "name": "Time", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "scheduledBy", + "description": "User that started the Jira import", + "args": [ + + ], + "type": { + "kind": "OBJECT", + "name": "User", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [ + + ], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "JiraImportConnection", + "description": "The connection type for JiraImport.", + "fields": [ + { + "name": "edges", + "description": "A list of edges.", + "args": [ + + ], + "type": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "JiraImportEdge", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "nodes", + "description": "A list of nodes.", + "args": [ + + ], + "type": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "JiraImport", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "pageInfo", + "description": "Information to aid in pagination.", + "args": [ + + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "PageInfo", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [ + + ], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "JiraImportEdge", + "description": "An edge in a connection.", + "fields": [ + { + "name": "cursor", + "description": "A cursor for use in pagination.", + "args": [ + + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "node", + "description": "The item at the end of the edge.", + "args": [ + + ], + "type": { + "kind": "OBJECT", + "name": "JiraImport", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [ + + ], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", "name": "Label", "description": null, "fields": [ @@ -17441,7 +17622,7 @@ }, { "name": "importStatus", - "description": "Status of project import background job of the project", + "description": "Status of import background job of the project", "args": [ ], @@ -17866,6 +18047,73 @@ "deprecationReason": null }, { + "name": "jiraImportStatus", + "description": "Status of Jira import background job of the project", + "args": [ + + ], + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "jiraImports", + "description": "Jira imports into the project", + "args": [ + { + "name": "after", + "description": "Returns the elements in the list that come after the specified cursor.", + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "defaultValue": null + }, + { + "name": "before", + "description": "Returns the elements in the list that come before the specified cursor.", + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "defaultValue": null + }, + { + "name": "first", + "description": "Returns the first _n_ elements from the list.", + "type": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + }, + "defaultValue": null + }, + { + "name": "last", + "description": "Returns the last _n_ elements from the list.", + "type": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + }, + "defaultValue": null + } + ], + "type": { + "kind": "OBJECT", + "name": "JiraImportConnection", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + }, + { "name": "jobsEnabled", "description": "(deprecated) Enable jobs for this project. Use `builds_access_level` instead", "args": [ diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index dfbd08be898..2aee7d484d0 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -605,6 +605,14 @@ Autogenerated return type of IssueSetWeight | `errors` | String! => Array | Reasons why the mutation failed. | | `issue` | Issue | The issue after mutation | +## JiraImport + +| Name | Type | Description | +| --- | ---- | ---------- | +| `jiraProjectKey` | String! | Project key for the imported Jira project | +| `scheduledAt` | Time | Timestamp of when the Jira import was created/started | +| `scheduledBy` | User | User that started the Jira import | + ## Label | Name | Type | Description | @@ -879,9 +887,10 @@ Information about pagination in a connection. | `group` | Group | Group of the project | | `httpUrlToRepo` | String | URL to connect to the project via HTTPS | | `id` | ID! | ID of the project | -| `importStatus` | String | Status of project import background job of the project | +| `importStatus` | String | Status of import background job of the project | | `issue` | Issue | A single issue of the project | | `issuesEnabled` | Boolean | (deprecated) Does this project have issues enabled?. Use `issues_access_level` instead | +| `jiraImportStatus` | String | Status of Jira import background job of the project | | `jobsEnabled` | Boolean | (deprecated) Enable jobs for this project. Use `builds_access_level` instead | | `lastActivityAt` | Time | Timestamp of the project last activity | | `lfsEnabled` | Boolean | Indicates if the project has Large File Storage (LFS) enabled | diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 32626c19298..061e910a6d0 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -563,18 +563,23 @@ sequenceDiagram participant Git on server Note left of Git on client: git fetch - Git on client->>SSH server: git fetch-pack - SSH server-->>AuthorizedKeysCommand: gitlab-shell-authorized-keys-check git AAAA... - AuthorizedKeysCommand-->>Rails: GET /internal/api/authorized_keys?key=AAAA... + Git on client->>+SSH server: ssh git fetch-pack request + SSH server->>+AuthorizedKeysCommand: gitlab-shell-authorized-keys-check git AAAA... + AuthorizedKeysCommand->>+Rails: GET /internal/api/authorized_keys?key=AAAA... Note right of Rails: Lookup key ID - Rails-->>SSH server: 200 OK, command="gitlab-shell upload-pack key_id=1" - SSH server-->>GitLab Shell: gitlab-shell upload-pack key_id=1 - GitLab Shell-->>Rails: GET /internal/api/allowed?action=upload_pack&key_id=1 + Rails-->>-AuthorizedKeysCommand: 200 OK, command="gitlab-shell upload-pack key_id=1" + AuthorizedKeysCommand-->>-SSH server: command="gitlab-shell upload-pack key_id=1" + SSH server->>+GitLab Shell: gitlab-shell upload-pack key_id=1 + GitLab Shell->>+Rails: GET /internal/api/allowed?action=upload_pack&key_id=1 Note right of Rails: Auth check - Rails-->>GitLab Shell: 200 OK, { gitaly: ... } - GitLab Shell-->>Gitaly: SSHService.SSHUploadPack bidirectional request - Gitaly-->>Git on server: git upload-pack - Git on server->>Git on client: SSHService.SSHUploadPack bidirectional response + Rails-->>-GitLab Shell: 200 OK, { gitaly: ... } + GitLab Shell->>+Gitaly: SSHService.SSHUploadPack request + Gitaly->>+Git on server: git upload-pack request + Note over Git on client,Git on server: Bidirectional communication between Git client and server + Git on server-->>-Gitaly: git upload-pack response + Gitaly -->>-GitLab Shell: SSHService.SSHUploadPack response + GitLab Shell-->>-SSH server: gitlab-shell upload-pack response + SSH server-->>-Git on client: ssh git fetch-pack response ``` The `git push` operation is very similar, except `git receive-pack` is used diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md index add466a91b1..896ae8e7c51 100644 --- a/doc/user/project/issues/design_management.md +++ b/doc/user/project/issues/design_management.md @@ -94,7 +94,7 @@ Images on the Design Management page can be enlarged by clicking on them. You can navigate through designs by clicking on the navigation buttons on the top-right corner or with <kbd>Left</kbd>/<kbd>Right</kbd> keyboard buttons. -The number of comments on a design — if any — is listed to the right +The number of discussions on a design — if any — is listed to the right of the design filename. Clicking on this number enlarges the design just like clicking anywhere else on the design. When a design is added or modified, an icon is displayed on the item @@ -102,7 +102,7 @@ to help summarize changes between versions. | Indicator | Example | | --------- | ------- | -| Comments | ![Comments Icon](img/design_comments_v12_3.png) | +| Discussions | ![Discussions Icon](img/design_comments_v12_3.png) | | Modified (in the selected version) | ![Design Modified](img/design_modified_v12_3.png) | | Added (in the selected version) | ![Design Added](img/design_added_v12_3.png) | @@ -110,7 +110,9 @@ to help summarize changes between versions. > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/13217) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.7. -Designs can be explored in greater detail by zooming in and out of the image. Control the amount of zoom with the `+` and `-` buttons at the bottom of the image. While zoomed, you can still [add new annotations](#adding-annotations-to-designs) to the image, and see any existing ones. +Designs can be explored in greater detail by zooming in and out of the image. +Control the amount of zoom with the `+` and `-` buttons at the bottom of the image. +While zoomed, you can still [start new discussions](#starting-discussions-on-designs) on the image, and see any existing ones. ![Design zooming](img/design_zooming_v12_7.png) @@ -142,23 +144,22 @@ Only the latest version of the designs can be deleted. Deleted designs are not permanently lost; they can be viewed by browsing previous versions. -## Adding annotations to designs +## Starting discussions on designs -When a design is uploaded, you can add annotations by clicking on -the image on the exact location you'd like to add the note to. -A badge is added to the image identifying the annotation, from -which you can start a new discussion: +When a design is uploaded, you can start a discussion by clicking on +the image on the exact location you would like the discussion to be focused on. +A pin is added to the image, identifying the discussion's location. ![Starting a new discussion on design](img/adding_note_to_design_1.png) [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34353) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.8, -you can adjust the badge's position by dragging it around the image. This is useful +you can adjust a pin's position by dragging it around the image. This is useful for when your design layout has changed between revisions, or if you need to move an -existing badge to add a new one in its place. +existing pin to add a new one in its place. -Different discussions have different badge numbers: +Different discussions have different pin numbers: -![Discussions on design annotations](img/adding_note_to_design_2.png) +![Discussions on designs](img/adding_note_to_design_2.png) -From GitLab 12.5 on, new annotations will be outputted to the issue activity, +From GitLab 12.5 on, new discussions will be outputted to the issue activity, so that everyone involved can participate in the discussion. |