7.0.0.rc1

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix mistake in reference_jira_issue method

Use local variable instead global
Point to 7-0-stable in installation docs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Bump shell version

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'update-guide-7-0' into 'master'

Installation guide for 7.0

* Changed branch to 7-0-stable
* Bump gitlab-shell version to 1.9.6
Update guide from 6.9 to 7.0

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch '7-0-update-guide' into 'master'

7.0 update guide
Spelling, you're showing the settings.
Spelling, needs to end the sentence.
Merge branch 'show-them' into 'master'

Improve the spelling on the project settings page
Revert "Merge branch 'fix-email-threading' into 'master'"

This reverts commit 97fd990ecde387290be269ef7daafa5761f94af6, reversing
changes made to f451a697e0c018359e6d8ff3aaba4eb0484c4bee.

Conflicts:
	app/mailers/emails/notes.rb
	app/mailers/emails/projects.rb
Merge pull request #7146 from zzet/patch-11

Fix mistake in reference_jira_issue method (markdown)
Merge branch 'revert_email_thread' into 'master'

Revert email threading rewrite

The 'to:' address introduced by this merge caused a flood of email going to an admin account for GitLab.com. This feature should not be shipped as-is.
Fix project trasnfer for admin area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'fix-500-admin-transfer' into 'master'

Fix 500 error when transfer project from admin area

Fixes #1349
During release we need to create several update guides

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Create 6.0-to-7.0 update guide
The Wall is deprecated in 7.0
Merge branch '6.0-to-7.0' into 'master'

Create 6.0-to-7.0 update guide
Fix permission issue with highest access level for group

If user was a member of both group and project and group access level
was higher it was not respected and user got lowest project access
level. Now it is fixed and user get highest access level

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>