diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-09-08 10:27:49 -0300 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-09-08 10:27:49 -0300 |
| commit | eb8373aa80905fc57173da03ed5b2bd972c83d53 (patch) | |
| tree | d543342c710b633fe75313ece472314202e7bc44 /webapp/components/login | |
| parent | a5ebbcfdb4f151de204b6be276c5f07175ceb82a (diff) | |
| parent | b2b2d141a9c4b423e6920930b726becd1e46436c (diff) | |
| download | chat-eb8373aa80905fc57173da03ed5b2bd972c83d53.tar.gz chat-eb8373aa80905fc57173da03ed5b2bd972c83d53.tar.bz2 chat-eb8373aa80905fc57173da03ed5b2bd972c83d53.zip | |
Merge branch 'release-3.4' RC4
Diffstat (limited to 'webapp/components/login')
| -rw-r--r-- | webapp/components/login/login_controller.jsx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx index 8335dce6f..117747ab9 100644 --- a/webapp/components/login/login_controller.jsx +++ b/webapp/components/login/login_controller.jsx @@ -459,6 +459,17 @@ export default class LoginController extends React.Component { ); } + if (gitlabSigninEnabled || samlSigninEnabled || office365SigninEnabled || googleSigninEnabled || gitlabSigninEnabled) { + loginControls.push( + <h5 key='oauthHeader'> + <FormattedMessage + id='login.signInWith' + defaultMessage='Sign in with:' + /> + </h5> + ); + } + if (gitlabSigninEnabled) { loginControls.push( <a |