allow sing in with GitLab email or login
Merge branch 'master' of github.com:gitlabhq/gitlab-ci