Merge branch 'collapseable-nav' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav

Merge branch 'issue-merge-req-context-links' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-issue-merge-req-context-links

Conflicts:
	CHANGELOG

Web editor documentation

Related to #1930

See merge request !1458

Access groups using path

Made diff colors a little less In Your Face

Tune commit page: async load of branch info

See merge request !1462

Conflicts:
	config/routes.rb

viewports for issues and merge requests

Update gitlab-shell to 2.4.2 for 7.7 install/update guide

closes #8718, closes #8721

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Rubycop improvements

See merge request !1463

Rubocop enabled for: Use spaces inside hash literal braces

See merge request !1461

Ruby hash 1.9 with rubycop check

See merge request !1460

Rubocop

See merge request !1459