diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-27 21:10:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-27 21:10:39 +0300 |
| commit | 9beaa6816987274f2b870146ac649c970d69da24 (patch) | |
| tree | 17af5519819903593a71b1eae47cbc0999f9a1c7 /doc/api | |
| parent | 524a21e75209d2501b23b648daf753e3a4bebe56 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/commits.md | 2 | ||||
| -rw-r--r-- | doc/api/settings.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/api/commits.md b/doc/api/commits.md index 609965f341d..5a3481ee086 100644 --- a/doc/api/commits.md +++ b/doc/api/commits.md @@ -753,7 +753,7 @@ Example response: ## List merge requests associated with a commit -Get a list of merge requests related to the specified commit. +Returns information about the merge request that originally introduced a specific commit. ```plaintext GET /projects/:id/repository/commits/:sha/merge_requests diff --git a/doc/api/settings.md b/doc/api/settings.md index 6ca94f840a2..6d92ceec285 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -524,8 +524,8 @@ listed in the descriptions of the relevant settings. | `whats_new_variant` | string | no | What's new variant, possible values: `all_tiers`, `current_tier`, and `disabled`. | | `web_ide_clientside_preview_enabled` | boolean | no | Live Preview (allow live previews of JavaScript projects in the Web IDE using CodeSandbox Live Preview). | | `wiki_page_max_content_bytes` | integer | no | Maximum wiki page content size in **bytes**. Default: 52428800 Bytes (50 MB). The minimum value is 1024 bytes. | -| `jira_connect_application_key` | String | no | Application ID of the OAuth application that should be used to authenticate with the GitLab.com for Jira Cloud app | -| `jira_connect_proxy_url` | String | no | URL of the GitLab instance that should be used as a proxy for the GitLab.com for Jira Cloud app | +| `jira_connect_application_key` | String | no | Application ID of the OAuth application that should be used to authenticate with the GitLab for Jira Cloud app | +| `jira_connect_proxy_url` | String | no | URL of the GitLab instance that should be used as a proxy for the GitLab for Jira Cloud app | ## Housekeeping fields |