fixed a test a broke in the configurable theme PR
Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e

Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85

-when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date

Conflicts:
	spec/lib/auth_spec.rb

Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574

Remove old assets before compiling new ones

Prevent empty public projects from throwing exceptions

Make users theme configurable

Fix API::MergeRequest

Corrects the update document to match the version of gitshell specified in the install document (1.7.1)

Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f

GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

Conflicts:
	app/models/user.rb
	config/initializers/1_settings.rb
	spec/models/user_spec.rb

Fixes #5144 Refs #4996

GITLAB-1279 (GITLAB-1264)

Change-Id: Ifb5b4313bc91fae720f8ef5c36152c45e9d38934

Added .ruby-version & .ruby-gemset in .gitignore

Drop support of root namespace in model

Don't show users password change page if ldap users

Fix issue_closing_regex in gitlab.yml.example

It turns out that regex escapes and YAML quoted-scalar escapes don't play
nicely together.