diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-16 15:08:39 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-16 15:08:39 +0000 |
commit | d7b1354b396d2e579fd6fe3c18a28b6ffe934f09 (patch) | |
tree | 958e3dd6579165d790febba196d64d6ef8c86ea5 /lib/api/settings.rb | |
parent | 1c9afffa29584c92bf1bb73c005f69c6875808e6 (diff) | |
download | gitlab-ce-d7b1354b396d2e579fd6fe3c18a28b6ffe934f09.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/settings.rb')
-rw-r--r-- | lib/api/settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 62f4aeb038a..c25a56d5f08 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -181,6 +181,7 @@ module API optional :runner_token_expiration_interval, type: Integer, desc: 'Token expiration interval for shared runners, in seconds' optional :group_runner_token_expiration_interval, type: Integer, desc: 'Token expiration interval for group runners, in seconds' optional :project_runner_token_expiration_interval, type: Integer, desc: 'Token expiration interval for project runners, in seconds' + optional :pipeline_limit_per_project_user_sha, type: Integer, desc: "Maximum number of pipeline creation requests allowed per minute per user and commit. Set to 0 for unlimited requests per minute." Gitlab::SSHPublicKey.supported_types.each do |type| optional :"#{type}_key_restriction", |