diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-14 08:49:36 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-14 08:49:36 +0000 |
| commit | 1afdbe320e60aa227dfd75ae1f1f128106660c8a (patch) | |
| tree | 38e91b764c45b2f0074829560325d0f4b2b4ae39 /doc | |
| parent | febd3884a293859a63d2a7ae83b969fc33448f26 (diff) | |
| parent | 672a68d3724bcae676d18244c85566e7d664a169 (diff) | |
| download | gitlab-ce-1afdbe320e60aa227dfd75ae1f1f128106660c8a.tar.gz | |
Merge branch 'fixes-for-internal-auth-disabled' into 'master'
Fixes needed when GitLab sign-in is not enabled
See merge request !12491
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/settings.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index eefbdda42ce..0b4cc98cea6 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -25,7 +25,7 @@ Example response: "id" : 1, "default_branch_protection" : 2, "restricted_visibility_levels" : [], - "signin_enabled" : true, + "password_authentication_enabled" : true, "after_sign_out_path" : null, "max_attachment_size" : 10, "user_oauth_applications" : true, @@ -63,7 +63,7 @@ PUT /application/settings | --------- | ---- | :------: | ----------- | | `default_projects_limit` | integer | no | Project limit per user. Default is `100000` | | `signup_enabled` | boolean | no | Enable registration. Default is `true`. | -| `signin_enabled` | boolean | no | Enable login via a GitLab account. Default is `true`. | +| `password_authentication_enabled` | boolean | no | Enable authentication via a GitLab account password. Default is `true`. | | `gravatar_enabled` | boolean | no | Enable Gravatar | | `sign_in_text` | string | no | Text on login page | | `home_page_url` | string | no | Redirect to this URL when not logged in | @@ -102,7 +102,7 @@ Example response: "id": 1, "default_projects_limit": 100000, "signup_enabled": true, - "signin_enabled": true, + "password_authentication_enabled": true, "gravatar_enabled": true, "sign_in_text": "", "created_at": "2015-06-12T15:51:55.432Z", |