"its" not "it's".

Change-Id: I1bdd3608d3b46924b5da3ae282c99f85ee4e0dab

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

GITLAB-1283 (GITLAB-869)

Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded

Conflicts:
	config/initializers/1_settings.rb

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

-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

Fixes #5144 Refs #4996

Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0

-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44

-API now respects default_projects_limit, default_can_create_group, and default_can_create_team

Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a

Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a

-Specifying a header of SUDO or adding a :sudo with either user id, or username of the user will set the current_user to be that user if your identifying private_token/PRIVATE_TOKEN is an administrator token

root user (su might be better)

Change-Id: I3b15ae34c0957a0f4026e1886c92a9770e9d170e

Change-Id: I5b174bba02856ede788dcb51ec9b0d598ea7d0df

* show highlights when replace empty line with content
* show inline diff when replace line with spaces with content

Authenticate or create users from OAuth providers

Use "/commits/:sha/diff" as opposed to "/commit/:sha", keeping in line
with existing api urls (e.g. "/projects/:id", etc.)

Fix 500 error resulting from a diff api call with an invalid commit hash

Move "/commits/:sha/blob" to "/blobs/:sha", leaving the old path for
backwards compatibility.

Add ability to get a single commit via "/commits/:sha"

Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller

You should update to 6.0 before proceed with update to higher version.
So its no reason to keep old tasks any more.
It should be still available in 6-0-stable but not in master