remove old assets before compiling
Fix API::MergeRequest

Fixes #5144 Refs #4996
Version 6.1.0
Fix hover for tree view
Merge branch '6-1-stable'
Corrects the update document to match the version of gitshell specified in the install document (1.7.1)
Merge pull request #5145 from hiroponz/fix-api-merge-request

Fix API::MergeRequest
Merge pull request #5116 from karlhungus/feature-configurable-theme

Make users theme configurable
Merge pull request #5142 from karlhungus/bugfix-handle-empty-public-projects

Prevent empty public projects from throwing exceptions
Merge pull request #5136 from f0k/patch-1

Remove old assets before compiling new ones
Allows username only updates to ldap properties

-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
Added ldap tests

Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85
Update for readability

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