From 5aa96ff14229dba7e35f213354963febf3ad2833 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 9 Mar 2020 21:07:57 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/administration/logs.md | 15 +++++++++++++++ doc/api/audit_events.md | 6 +++++- doc/development/mass_insert.md | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/administration/logs.md b/doc/administration/logs.md index e45e39c4651..222d79ddc35 100644 --- a/doc/administration/logs.md +++ b/doc/administration/logs.md @@ -400,6 +400,21 @@ For source installations, edit the `gitlab.yml` and set the Sidekiq log_format: json ``` +## `sidekiq_client.log` + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26586) in GitLab 12.9. + +This file lives in `/var/log/gitlab/gitlab-rails/sidekiq_client.log` for +Omnibus GitLab packages or in `/home/git/gitlab/log/sidekiq_client.log` for +installations from source. + +This file contains logging information about jobs before they are start +being processed by Sidekiq, for example before being enqueued. + +This logfile follows the same structure as +[`sidekiq.log`](#sidekiqlog), so it will be structured as JSON if +you've configured this for Sidekiq as mentioned above. + ## `gitlab-shell.log` This file lives in `/var/log/gitlab/gitaly/gitlab-shell.log` for diff --git a/doc/api/audit_events.md b/doc/api/audit_events.md index cba7da4ac1b..944d99d8eab 100644 --- a/doc/api/audit_events.md +++ b/doc/api/audit_events.md @@ -91,6 +91,10 @@ Example response: GET /audit_events/:id ``` +| Attribute | Type | Required | Description | +| --------- | ---- | -------- | ----------- | +| `id` | integer | yes | The ID of the audit event | + ```shell curl --header "PRIVATE-TOKEN: " https://primary.example.com/api/v4/audit_events/1 ``` @@ -195,7 +199,7 @@ GET /groups/:id/audit_events/:audit_event_id | Attribute | Type | Required | Description | | --------- | ---- | -------- | ----------- | | `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) | -| `audit_event_id` | integer | yes | ID of the audit event | +| `audit_event_id` | integer | yes | The ID of the audit event | ```shell curl --header "PRIVATE-TOKEN: " https://primary.example.com/api/v4/groups/60/audit_events/2 diff --git a/doc/development/mass_insert.md b/doc/development/mass_insert.md index 891ce0db87d..47f993a921e 100644 --- a/doc/development/mass_insert.md +++ b/doc/development/mass_insert.md @@ -9,5 +9,5 @@ the following snippet in the rails console. ```ruby u = User.find(1) -Project.last(100).each { |p| p.set_create_timestamps && p.add_maintainer(u, current_user: u) } # Change 100 to whatever number of projects you need access to +Project.last(100).each { |p| p.set_timestamps_for_create && p.add_maintainer(u, current_user: u) } # Change 100 to whatever number of projects you need access to ``` -- cgit v1.2.1