diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-10-22 11:29:03 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-10-22 11:29:03 +0000 |
| commit | 1eb4f20ca1487948fda6a6e8b80fa719d16febbd (patch) | |
| tree | 9a3237754a17eac2edf964f258a005ffdedc7fb1 /app/models/commit.rb | |
| parent | 7dd21a8bfd418705c26fcc9e081450ef6f4aae86 (diff) | |
| parent | 57046eb0abf280594d6625db3429f13d45499c83 (diff) | |
| download | gitlab-ce-1eb4f20ca1487948fda6a6e8b80fa719d16febbd.tar.gz | |
Merge branch 'ldap-login-styles' into 'master'
Support LDAP login tabs wrapping to second line (and a few other login fixes)
## What does this MR do?
Fixes some regressions introduced for customers with multiple servers configured for login and/or long label names.
Also, improves styling for the login page on small screens.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
See the bad behavior here: https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117893
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117677
See merge request !6993
Diffstat (limited to 'app/models/commit.rb')
0 files changed, 0 insertions, 0 deletions