Skip to content
Snippets Groups Projects

Add support to configure webhook_timeout in gitlab.yaml

Closed Add support to configure webhook_timeout in gitlab.yaml
github/fork/wesgurn/master into master
Closed gitlab-qa-bot requested to merge github/fork/wesgurn/master into master
Viewing commit bf309fcf
Prev Next
Show latest version
1 file
+ 1
− 2
Compare changes
  • Side-by-side
  • Inline
  • bf309fcf 
    If you are running another sidekiq instance on your server, e.g. GitLab
CI, the check script would parse the output of `ps aux` searching for
`sidekiq` and returning success, although the GitLab sidekiq may not be
running.

Now the `ps` call will only print the processes run by the GitLab user.
doc/api/users.md
+ 34
− 23
@@ -22,8 +22,10 @@ GET /users
"twitter": "",
"extern_uid": "john.smith",
"provider": "provider_name",
"theme_id": 1
"color_scheme_id": 2
"theme_id": 1,
"color_scheme_id": 2,
"is_admin": false,
"can_create_group": true
},
{
"id": 2,
@@ -38,8 +40,11 @@ GET /users
"twitter": "",
"extern_uid": "jack.smith",
"provider": "provider_name",
"theme_id": 1
"color_scheme_id": 3
"theme_id": 1,
"color_scheme_id": 3,
"is_admin": false,
"can_create_group": true,
"can_create_project": true
}
]
```
@@ -71,8 +76,11 @@ Parameters:
"twitter": "",
"extern_uid": "john.smith",
"provider": "provider_name",
"theme_id": 1
"color_scheme_id": 2
"theme_id": 1,
"color_scheme_id": 2,
"is_admin": false,
"can_create_group": true,
"can_create_project": true
}
```
@@ -87,17 +95,19 @@ POST /users
Parameters:
+ `email` (required) - Email
+ `password` (required) - Password
+ `username` (required) - Username
+ `name` (required) - Name
+ `skype` (optional) - Skype ID
+ `linkedin` (optional) - Linkedin
+ `twitter` (optional) - Twitter account
+ `projects_limit` (optional) - Number of projects user can create
+ `extern_uid` (optional) - External UID
+ `provider` (optional) - External provider name
+ `bio` (optional) - User's bio
+ `email` (required) - Email
+ `password` (required) - Password
+ `username` (required) - Username
+ `name` (required) - Name
+ `skype` (optional) - Skype ID
+ `linkedin` (optional) - Linkedin
+ `twitter` (optional) - Twitter account
+ `projects_limit` (optional) - Number of projects user can create
+ `extern_uid` (optional) - External UID
+ `provider` (optional) - External provider name
+ `bio` (optional) - User's bio
+ `admin` (optional) - User is admin - true or false (default)
+ `can_create_group` (optional) - User can create groups - true or false
## User modification
@@ -121,6 +131,8 @@ Parameters:
+ `extern_uid` - External UID
+ `provider` - External provider name
+ `bio` - User's bio
+ `admin` (optional) - User is admin - true or false (default)
+ `can_create_group` (optional) - User can create groups - true or false
Note, at the moment this method does only return a 404 error, even in cases where a 409 (Conflict) would
be more appropriate, e.g. when renaming the email address to some existing one.
@@ -162,11 +174,10 @@ GET /user
"skype": "",
"linkedin": "",
"twitter": "",
"theme_id": 1
"color_scheme_id": 2
"theme_id": 1,
"color_scheme_id": 2,
"is_admin": false,
"can_create_group" : true,
"can_create_team" : true,
"can_create_project" : true
}
```
@@ -184,14 +195,14 @@ GET /user/keys
[
{
"id": 1,
"title" : "Public key"
"title" : "Public key",
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
},
{
"id": 3,
"title" : "Another Public key"
"title" : "Another Public key",
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
@@ -219,7 +230,7 @@ Parameters:
```json
{
"id": 1,
"title" : "Public key"
"title" : "Public key",
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="