diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 18:08:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 18:08:47 +0000 |
commit | 3832718d895bf8268f3e3aac85948e2792769345 (patch) | |
tree | 4a322399af568b6203e732ae2e2f3efc39b23a67 /doc | |
parent | 180cd023a11c0eb413ad0de124d9758ea25672bd (diff) | |
download | gitlab-ce-3832718d895bf8268f3e3aac85948e2792769345.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/operations/extra_sidekiq_processes.md | 29 | ||||
-rw-r--r-- | doc/api/applications.md | 17 | ||||
-rw-r--r-- | doc/api/repositories.md | 2 |
3 files changed, 11 insertions, 37 deletions
diff --git a/doc/administration/operations/extra_sidekiq_processes.md b/doc/administration/operations/extra_sidekiq_processes.md index 8ab75da3501..fd5f9fe6c26 100644 --- a/doc/administration/operations/extra_sidekiq_processes.md +++ b/doc/administration/operations/extra_sidekiq_processes.md @@ -284,32 +284,3 @@ command and not the PID(s) of the started Sidekiq processes. The Rails environment can be set by passing the `--environment` flag to the `sidekiq-cluster` command, or by setting `RAILS_ENV` to a non-empty value. The default value can be found in `/opt/gitlab/etc/gitlab-rails/env/RAILS_ENV`. - -### Using negation - -You're able to run all queues in the `all_queues.yml` file (or the equivalent EE -file) on a single or multiple processes with exceptions using the `--negate` -flag. - -For example, say you want to run a single process for all queues, -except `process_commit` and `post_receive`: - -```bash -/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit,post_receive --negate -``` - -For multiple processes of all queues (except `process_commit` and `post_receive`): - -```bash -/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit,post_receive process_commit,post_receive --negate -``` - -### Limiting concurrency - -By default, `sidekiq-cluster` will spin up extra Sidekiq processes that use -one thread per queue up to a maximum of 50. If you wish to change the cap, use -the `-m N` option. For example, this would cap the maximum number of threads to 1: - -```bash -/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit,post_receive -m 1 -``` diff --git a/doc/api/applications.md b/doc/api/applications.md index bcd119d1969..549828a983e 100644 --- a/doc/api/applications.md +++ b/doc/api/applications.md @@ -22,11 +22,12 @@ POST /applications Parameters: -| Attribute | Type | Required | Description | -|:---------------|:-------|:---------|:---------------------------------| -| `name` | string | yes | Name of the application. | -| `redirect_uri` | string | yes | Redirect URI of the application. | -| `scopes` | string | yes | Scopes of the application. | +| Attribute | Type | Required | Description | +|:---------------|:--------|:---------|:---------------------------------| +| `name` | string | yes | Name of the application. | +| `redirect_uri` | string | yes | Redirect URI of the application. | +| `scopes` | string | yes | Scopes of the application. | +| `confidential` | boolean | no | The application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential. Defaults to `true` if not supplied | Example request: @@ -42,7 +43,8 @@ Example response: "application_id": "5832fc6e14300a0d962240a8144466eef4ee93ef0d218477e55f11cf12fc3737", "application_name": "MyApplication", "secret": "ee1dd64b6adc89cf7e2c23099301ccc2c61b441064e9324d963c46902a85ec34", - "callback_url": "http://redirect.uri" + "callback_url": "http://redirect.uri", + "confidential": true } ``` @@ -68,7 +70,8 @@ Example response: "id":1, "application_id": "5832fc6e14300a0d962240a8144466eef4ee93ef0d218477e55f11cf12fc3737", "application_name": "MyApplication", - "callback_url": "http://redirect.uri" + "callback_url": "http://redirect.uri", + "confidential": true } ] ``` diff --git a/doc/api/repositories.md b/doc/api/repositories.md index 4aff79c9c62..4bc28dd342f 100644 --- a/doc/api/repositories.md +++ b/doc/api/repositories.md @@ -128,7 +128,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.com/api/v4/pro ## Compare branches, tags or commits This endpoint can be accessed without authentication if the repository is -publicly accessible. +publicly accessible. Note that diffs could have an empty diff string if [diff limits](../development/diffs.html#diff-limits) are reached. ``` GET /projects/:id/repository/compare |