Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md

PivotalTracker Source Commits Endpoint

Update check script in stable branch

* GitLab Shell 1.7.1 is required
* Global projects are not supported (refs #5152)

Fix API::MergeRequest in 6-1-stable

Refs #5145

Corrects the update document to match the version of gitshell specified ...

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

Drop support of root namespace in model

Don't show users password change page if ldap users

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