delta/gitlab/gitlab-ce.git, branch refactor-styles

Fix typos in application.scss

2015-10-12T19:00:21+00:00

Add css welcome notice

2015-10-12T13:08:33+00:00

Signed-off-by: Dmitriy Zaporozhets

Re-organize GitLab css into 2 directories: framework and page specific css

2015-10-12T13:00:04+00:00

Signed-off-by: Dmitriy Zaporozhets

Move CI styles to pages dir

2015-10-12T12:49:23+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'docs-update' into 'master'

2015-10-12T07:23:21+00:00


removed extra_sign_in_text examples for gitlab.rb [ci skip]

I removed the extra_sign_in_text option documentation. This is no longer needed because a welcome message aka. extra_sign_in_text can now be set/changed in the admin UI.  

Admin area > Settings

This was mentioned in issue #3006

See merge request !1565

Merge branch 'fix_email_downcasing' into 'master'

2015-10-11T22:53:11+00:00


LDAP email address downcasing

Fixes #2960

In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. 

If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved.

This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression.

See merge request !1550

removed extra_sign_in_text examples for gitlab.rb [ci skip]

2015-10-11T12:19:05+00:00

Merge branch 'rs-remove-slim' into 'master'

2015-10-10T23:12:37+00:00


Remove slim

Closes #2897 

See merge request !1537

Add CHANGELOG entry for !1543

2015-10-10T18:24:00+00:00

[ci skip]

Merge branch 'master' into 'master'

2015-10-10T18:22:16+00:00


Persist filters when sorting on user admin page

Closes #2806

See merge request !1543