Added .ruby-version & .ruby-gemset in .gitignore
Drop support of root namespace in model
Don't show users password change page if ldap users
Merge pull request #5117 from karlhungus/feature-password-update-skipped-when-ldap-user

Don't show users password change page if ldap users
Merge pull request #5112 from hiroponz/drop-support-of-root-namespace

Drop support of root namespace in model
Add author and issue id warning.
Merge branch 'changelog-specifics' of /home/git/repositories/gitlab/gitlabhq
Merge pull request #5099 from yatishmehta27/gitignore-changes

Added .ruby-version & .ruby-gemset in .gitignore
Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq
README improved. Removed travis badge
Add author of new init script
remove old assets before compiling
Prevent empty public projects from throwing exceptions

GITLAB-1279 (GITLAB-1264)

Change-Id: Ifb5b4313bc91fae720f8ef5c36152c45e9d38934
Merge branch 'update_changelog' of /home/git/repositories/axil/gitlabhq
Update gitlab_git to version 2.3.1
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Restyle tree table UI
Restyle event title
Fix API::MergeRequest

Fixes #5144 Refs #4996
Make users theme configurable

GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

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