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 /lib/api/entities.rb | |
| 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 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 47742a164fc..09a88869063 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -621,7 +621,8 @@ module API expose :id expose :default_projects_limit expose :signup_enabled - expose :signin_enabled + expose :password_authentication_enabled + expose :password_authentication_enabled, as: :signin_enabled expose :gravatar_enabled expose :sign_in_text expose :after_sign_up_text |