From 6b13a226ddfc49140d58e7e88f8703ae0ed90574 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 29 Nov 2019 09:06:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../monitoring/performance/img/performance_bar.png | Bin 58439 -> 71551 bytes .../performance/img/performance_bar_frontend.png | Bin 0 -> 362077 bytes .../monitoring/performance/performance_bar.md | 6 ++++++ doc/api/issues.md | 6 ++++-- doc/development/git_object_deduplication.md | 2 +- doc/user/project/deploy_boards.md | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 doc/administration/monitoring/performance/img/performance_bar_frontend.png (limited to 'doc') diff --git a/doc/administration/monitoring/performance/img/performance_bar.png b/doc/administration/monitoring/performance/img/performance_bar.png index 73f2ccbe4bb..e876e2f373b 100644 Binary files a/doc/administration/monitoring/performance/img/performance_bar.png and b/doc/administration/monitoring/performance/img/performance_bar.png differ diff --git a/doc/administration/monitoring/performance/img/performance_bar_frontend.png b/doc/administration/monitoring/performance/img/performance_bar_frontend.png new file mode 100644 index 00000000000..489f855fe33 Binary files /dev/null and b/doc/administration/monitoring/performance/img/performance_bar_frontend.png differ diff --git a/doc/administration/monitoring/performance/performance_bar.md b/doc/administration/monitoring/performance/performance_bar.md index caddc87d8c1..e65fdfd028d 100644 --- a/doc/administration/monitoring/performance/performance_bar.md +++ b/doc/administration/monitoring/performance/performance_bar.md @@ -16,6 +16,12 @@ It allows you to see (from left to right): ![Rugged profiling using the Performance Bar](img/performance_bar_rugged_calls.png) - time taken and number of Redis calls; click through for details of these calls ![Redis profiling using the Performance Bar](img/performance_bar_redis_calls.png) +- total load timings of the page; click through for details of these calls + - BE = Backend - Time that the actual base page took to load + - FCP = [First Contentful Paint](https://developers.google.com/web/tools/lighthouse/audits/first-contentful-paint) - Time until something was visible to the user + - DOM = [DomContentLoaded](https://developers.google.com/web/fundamentals/performance/critical-rendering-path/measure-crp) Event + - Number of Requests that the page loaded + ![Frontend requests using the Performance Bar](img/performance_bar_frontend.png) - a link to add a request's details to the performance bar; the request can be added by its full URL (authenticated as the current user), or by the value of its `X-Request-Id` header diff --git a/doc/api/issues.md b/doc/api/issues.md index 29f9cb40e41..fe551cfb397 100644 --- a/doc/api/issues.md +++ b/doc/api/issues.md @@ -627,7 +627,8 @@ POST /projects/:id/issues | `merge_request_to_resolve_discussions_of` | integer | no | The IID of a merge request in which to resolve all issues. This will fill the issue with a default description and mark all discussions as resolved. When passing a description or title, these values will take precedence over the default values.| | `discussion_to_resolve` | string | no | The ID of a discussion to resolve. This will fill in the issue with a default description and mark the discussion as resolved. Use in combination with `merge_request_to_resolve_discussions_of`. | | `weight` **(STARTER)** | integer | no | The weight of the issue. Valid values are greater than or equal to 0. | -| `epic_iid` **(ULTIMATE)** | integer | no | IID of the epic to add the issue to. Valid values are greater than or equal to 0. | +| `epic_id` **(ULTIMATE)** | integer | no | ID of the epic to add the issue to. Valid values are greater than or equal to 0. | +| `epic_iid` **(ULTIMATE)** | integer | no | IID of the epic to add the issue to. Valid values are greater than or equal to 0. (deprecated, [will be removed in 13.0](https://gitlab.com/gitlab-org/gitlab/issues/35157)) | ```bash curl --request POST --header "PRIVATE-TOKEN: " https://gitlab.example.com/api/v4/projects/4/issues?title=Issues%20with%20auth&labels=bug @@ -729,7 +730,8 @@ PUT /projects/:id/issues/:issue_iid | `due_date` | string | no | Date time string in the format YEAR-MONTH-DAY, e.g. `2016-03-11` | | `weight` **(STARTER)** | integer | no | The weight of the issue. Valid values are greater than or equal to 0. 0 | | `discussion_locked` | boolean | no | Flag indicating if the issue's discussion is locked. If the discussion is locked only project members can add or edit comments. | -| `epic_iid` **(ULTIMATE)** | integer | no | IID of the epic to add the issue to. Valid values are greater than or equal to 0. | +| `epic_id` **(ULTIMATE)** | integer | no | ID of the epic to add the issue to. Valid values are greater than or equal to 0. | +| `epic_iid` **(ULTIMATE)** | integer | no | IID of the epic to add the issue to. Valid values are greater than or equal to 0. (deprecated, [will be removed in 13.0](https://gitlab.com/gitlab-org/gitlab/issues/35157)) | ```bash curl --request PUT --header "PRIVATE-TOKEN: " https://gitlab.example.com/api/v4/projects/4/issues/85?state_event=close diff --git a/doc/development/git_object_deduplication.md b/doc/development/git_object_deduplication.md index 6d9eb90d482..938882ba5a2 100644 --- a/doc/development/git_object_deduplication.md +++ b/doc/development/git_object_deduplication.md @@ -111,7 +111,7 @@ are as follows: contents of the pool repository are a Git clone of the source project repository. - The occasion for creating a pool is when an existing eligible - (public, hashed storage, non-forked) GitLab project gets forked and + (non-private, hashed storage, non-forked) GitLab project gets forked and this project does not belong to a pool repository yet. The fork parent project becomes the source project of the new pool, and both the fork parent and the fork child project become members of the new diff --git a/doc/user/project/deploy_boards.md b/doc/user/project/deploy_boards.md index b14d7f821bb..98e9188ed9b 100644 --- a/doc/user/project/deploy_boards.md +++ b/doc/user/project/deploy_boards.md @@ -14,7 +14,7 @@ With Deploy Boards you can gain more insight into deploys with benefits such as: - Following a deploy from the start, not just when it's done - Watching the rollout of a build across multiple servers -- Finer state detail (Waiting, Deploying, Finished, Unknown) +- Finer state detail (Succeeded, Running, Failed, Pending, Unknown) - See [Canary Deployments](canary_deployments.md) Here's an example of a Deploy Board of the production environment. -- cgit v1.2.1