diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 15:07:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 15:07:40 +0300 |
commit | f864f8a7aafa45b0e4c04e4312f89da4b1227c0f (patch) | |
tree | e559b53ae6a7594f28409bab9d38325200b38495 /doc | |
parent | 898e2cc1dfa88b4ac39cb4b35011f61b37f57b51 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/logs.md | 41 | ||||
-rw-r--r-- | doc/user/discussions/index.md | 5 | ||||
-rw-r--r-- | doc/user/project/quick_actions.md | 3 | ||||
-rw-r--r-- | doc/user/project/repository/index.md | 29 |
4 files changed, 76 insertions, 2 deletions
diff --git a/doc/administration/logs.md b/doc/administration/logs.md index f4a1c754252..fab37248134 100644 --- a/doc/administration/logs.md +++ b/doc/administration/logs.md @@ -421,6 +421,47 @@ etc. For example: {"severity":"DEBUG","time":"2019-10-17T06:23:13.227Z","correlation_id":null,"message":"redacted_search_result","class_name":"Milestone","id":2,"ability":"read_milestone","current_user_id":2,"query":"project"} ``` +## `exceptions_json.log` + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/17819) in GitLab 12.6. + +This file lives in +`/var/log/gitlab/gitlab-rails/exceptions_json.log` for Omnibus GitLab +packages or in `/home/git/gitlab/log/exceptions_json.log` for installations +from source. + +It logs the information about exceptions being tracked by `Gitlab::ErrorTracking` which provides standard and consistent way of [processing rescued exceptions](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/development/logging.md#exception-handling). + +Each line contains a JSON line that can be ingested by Elasticsearch. For example: + +```json +{ + "severity": "ERROR", + "time": "2019-12-17T11:49:29.485Z", + "correlation_id": "AbDVUrrTvM1", + "extra.server": { + "os": { + "name": "Darwin", + "version": "Darwin Kernel Version 19.2.0", + "build": "19.2.0", + }, + "runtime": { + "name": "ruby", + "version": "ruby 2.6.3p62 (2019-04-16 revision 67580) [x86_64-darwin18]" + } + }, + "extra.project_id": 55, + "extra.relation_key": "milestones", + "extra.relation_index": 1, + "exception.class": "NoMethodError", + "exception.message": "undefined method `strong_memoize' for #<Gitlab::ImportExport::RelationFactory:0x00007fb5d917c4b0>", + "exception.backtrace": [ + "lib/gitlab/import_export/relation_factory.rb:329:in `unique_relation?'", + "lib/gitlab/import_export/relation_factory.rb:345:in `find_or_create_object!'" + ] +} +``` + [repocheck]: repository_checks.md [Rack Attack]: ../security/rack_attack.md [Rate Limit]: ../user/admin_area/settings/rate_limits_on_raw_endpoints.md diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index d4e485d7c32..2eddd9e2ea3 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -352,7 +352,10 @@ bottom of the screen with two buttons: Clicking **Submit review** will publish all comments. Any quick actions submitted are performed at this time. -Alternatively, every pending comment has a button to finish the entire review. +Alternatively, to finish the entire review from a pending comment: + +- Click the **Finish review** button on the comment. +- Use the `/submit_review` [quick action](../project/quick_actions.md) in the text of non-review comment. ![Review submission](img/review_preview.png) diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md index 97ae429a33f..a038dadd7e7 100644 --- a/doc/user/project/quick_actions.md +++ b/doc/user/project/quick_actions.md @@ -68,7 +68,8 @@ The following quick actions are applicable to descriptions, discussions and thre | `/remove_zoom` | ✓ | | | Remove Zoom meeting from this issue. ([Introduced in GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/merge_requests/16609)) | | `/target_branch <local branch name>` | | ✓ | | Set target branch | | `/wip` | | ✓ | | Toggle the Work In Progress status | -| `/approve` | | ✓ | | Approve the merge request | +| `/approve` | | ✓ | | Approve the merge request **(STARTER)** | +| `/submit_review` | | ✓ | | Submit a pending review. ([Introduced in GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/issues/8041)) **(PREMIUM)** | | `/merge` | | ✓ | | Merge (when pipeline succeeds) | | `/child_epic <epic>` | | | ✓ | Add child epic to `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic`, or a URL to an epic. ([Introduced in GitLab 12.0](https://gitlab.com/gitlab-org/gitlab/issues/7330)) **(ULTIMATE)** | | `/remove_child_epic <epic>` | | | ✓ | Remove child epic from `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic`, or a URL to an epic. ([Introduced in GitLab 12.0](https://gitlab.com/gitlab-org/gitlab/issues/7330)) **(ULTIMATE)** | diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md index fc422bb5aba..fad8cbe81cb 100644 --- a/doc/user/project/repository/index.md +++ b/doc/user/project/repository/index.md @@ -116,6 +116,35 @@ rendered to HTML when viewed. Interactive features, including JavaScript plots, will not work when viewed in GitLab. +### OpenAPI viewer + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/19515) in GitLab 12.6. + +GitLab can render OpenAPI specification files with its file viewer, provided +their filenames include `openapi` or `swagger` and their extension is `yaml`, +`yml`, or `json`. The following examples are all correct: + +- `openapi.yml` +- `openapi.yaml` +- `openapi.json` +- `swagger.yml` +- `swagger.yaml` +- `swagger.json` +- `gitlab_swagger.yml` +- `openapi_gitlab.yml` +- `OpenAPI.YML` +- `openapi.Yaml` +- `openapi.JSON` +- `openapi.gitlab.yml` +- `gitlab.openapi.yml` + +Then, to render them: + +1. Navigate to the OpenAPI file in your repository in GitLab's UI. +1. Click the "Display OpenAPI" button which is located between the "Display source" + and "Edit" buttons (when an OpenAPI file is found, it replaces the + "Display rendered file" button). + ## Branches For details, see [Branches](branches/index.md). |