Add a combined update doc from 5.1 to 6.0
hotfix
Merge branch 'master' into develop

* master:
  hotfix
Report application status through init exit code
Remove migration tasks
Universal update guide for patch versions
master is on 6.3.0.pre now
Refer to disclosure policy in CONTRIBUTING.md
Merge branch 'init_exit_status' of /home/git/repositories/gitlab/gitlabhq
Merge branch 'security_vulnerabilities' of /home/git/repositories/gitlab/gitlabhq
Merge branch '51-to-60-update' of /home/git/repositories/gitlab/gitlabhq
API: set gitlab-ci service for project
Merge branch 'api/gitlab-ci' of /home/git/repositories/gitlab/gitlabhq
gitlab-ci service api: clean values instead of destroy
Escape strings

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Check if a file is editied "on" a branch or a commit.

The previous behavior was a "disabled" link, which was still clickable
and linked to the edit file action.

If the 	user accesses a path like "/edit/master/README" show the file
edit form (just like before).

If the user accesses a path like
"/edit/8d5c1f375ce99e5df84e26b0eafbf1448c6a001e/README", redirect the
user to the file detail page with a note, that he cannot edit a file
"on" a commit.

fixes #5482
Merge pull request #5484 from jojosch/edit-file-on-commit-disable

Check if a file is editied "on" a branch or a commit.
Respect the configured redis URL when initializing the session store

It was not possible to start Gitlab with a redis server running on another host or port. Every other subsystem that uses redis respects the settings in config/resque.yml.

This patch uses the configured url from the cache_store configuration.
The cache_store configuration already loads the correct redis url from config/resque.yml.

Closes #5406
Merge pull request #5474 from vollnhals/patch-1

Respect the configured redis URL when initializing the session store
Best to escape strings not split them

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>