summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-05 18:09:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-05 18:09:06 +0000
commitb042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d (patch)
treede31671ab7c6ca8c2a3721cbabd1f2a42b3d0194 /doc/api
parenteabf8fd774fef6a54903e5141138f47bdafeb331 (diff)
downloadgitlab-ce-b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/error_tracking.md28
-rw-r--r--doc/api/issues.md1
-rw-r--r--doc/api/merge_requests.md3
3 files changed, 31 insertions, 1 deletions
diff --git a/doc/api/error_tracking.md b/doc/api/error_tracking.md
index 6efafd4189a..e20b74d764b 100644
--- a/doc/api/error_tracking.md
+++ b/doc/api/error_tracking.md
@@ -30,3 +30,31 @@ Example response:
"api_url": "https://sentry.io/api/0/projects/myawesomeproject/project"
}
```
+
+### Enable or disable the Error Tracking project settings
+
+The API allows you to enable or disable the Error Tracking settings for a project. Only for project maintainers.
+
+```
+PATCH /projects/:id/error_tracking/settings
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ------- | -------- | --------------------- |
+| `id` | integer | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user. |
+| `active` | boolean | yes | Pass `true` to enable the already configured error tracking settings or `false` to disable it. |
+
+```shell
+curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/projects/1/error_tracking/settings?active=true
+```
+
+Example response:
+
+```json
+{
+ "active": true,
+ "project_name": "sample sentry project",
+ "sentry_external_url": "https://sentry.io/myawesomeproject/project",
+ "api_url": "https://sentry.io/api/0/projects/myawesomeproject/project"
+}
+```
diff --git a/doc/api/issues.md b/doc/api/issues.md
index 68fcc55acf2..2bb25c6e7d5 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -222,6 +222,7 @@ GET /groups/:id/issues?confidential=true
| `updated_before` | datetime | no | Return issues updated on or before the given time |
| `confidential` | Boolean | no | Filter confidential or public issues. |
| `not` | Hash | no | Return issues that do not match the parameters supplied. Accepts: `labels`, `milestone`, `author_id`, `author_username`, `assignee_id`, `assignee_username`, `my_reaction_emoji`, `search`, `in` |
+| `non_archived` | Boolean | no | Return issues from non archived projects. Default is true. _(Introduced in [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23785))_ |
```shell
curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/groups/4/issues
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 266f419e9be..750bdbcb050 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -396,7 +396,8 @@ Parameters:
| `my_reaction_emoji` | string | no | Return merge requests reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. _([Introduced][ce-14016] in GitLab 10.0)_ |
| `source_branch` | string | no | Return merge requests with the given source branch |
| `target_branch` | string | no | Return merge requests with the given target branch |
-| `search` | string | no | Search merge requests against their `title` and `description` |
+| `search` | string | no | Search merge requests against their `title` and `description` |
+| `non_archived` | Boolean | no | Return merge requests from non archived projects only. Default is true. _(Introduced in [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23809))_ |
```json
[