Typo it -> its.
Merge pull request #7814 from cirosantilli/test-typo

Typo it -> its.
Save last scrollposition and scroll back when leaving ZEN mode
Merge pull request #7809 from bbodenmiller/patch-25

update gitlab shell to 1.9.8 for gitlab 7.2.2
Merge pull request #7812 from bbodenmiller/7.3-upgrade

improve 7.3 upgrade process & redis setup
Merge pull request #7815 from Razer6/zen/fix_scroll_position

Save last scrollposition and scroll back when leaving ZEN mode
Replace old spinach step definitions with step.
Improve the wording explaining protected branches.
Add wisdom about reverting a revert merge.
Revert "Diff headers made sticky."

This reverts commit 6eb85b1a30eb2e87fc6a55d17bb38fdf535a516b.
Merge branch 'revert_sticky_headers' into 'master'

Revert sticky headers

See merge request !1104
Version 7.3.0.
Update manual installation guide for the correct shell version.
Support sockets in 'rake gitlab:shell:install'
Merge branch 'shell_install_socket'

Conflicts:
	doc/install/installation.md
Prefix Spinach features with Spinach::Features::.
Time for 7.4.0-pre.
Order of tasks in monthly release doc.
Add steps for building and deploying gitlab.com packages to monthly release document.
Update monthly release doc that we are not using travis anymore.