diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-13 17:43:17 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-13 17:43:17 +0000 |
commit | 917ae13bf8d31296ab5de6f494727d9b94d60265 (patch) | |
tree | 9f3ee4f69ff7dd970af1baf5945fab5030cc8a16 /lib/api/files.rb | |
parent | 2f9661dcd30219ced570944de2f4384ded429055 (diff) | |
parent | 7c39e728ef348482bd8caeeeeba2316ace92f4e9 (diff) | |
download | gitlab-ce-917ae13bf8d31296ab5de6f494727d9b94d60265.tar.gz |
Merge branch 'signin-page-headings' into 'master'
Add headings to signin/signup blocks on signin page.
See #1986

When signup is disabled, the heading for sign in only reads "Sign in", because there is no longer a choice of Existing/New user.
I've moved the OAuth signin options to just below the signin box because it looked odd as a separate box without a heading.
cc @sytse
See merge request !1516
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions