7.10 requires gitlab-shell 2.6.2.

Fixes #1467.

See merge request !552

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

Conflicts:
	app/controllers/import/google_code_controller.rb

Fix some issues with Google Code importer

Thanks, @mrtux, for reporting all of these.

See merge request !551

Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.

Addresses #1461 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2253.

This regression was introduced between 7.9 and the 7.10 rcs, so no changelog item for 7.10 proper.

cc @JobV @jacobvosmaer

See merge request !546

upgrade hipchat

Fix "Cannot move project" error message from popping up after a successful transfer

The JavaScript click handlers were never being removed, leading to duplicate requests when attempting to transfer a project to another namespace. The first transfer would succeed but the subsequent ones would fail, leading to the error message saying, "Cannot move project".

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/0c9f61294291514e0c2a48c204b6a1aa/image.png)

I attempted to write a unit test for this, but it was taking me too long to get it right.

Closes #1448 and #1128

See merge request !548

Multiple event handlers were firing, causing multiple form submissions.

Closes #1448 and #1128

Fixed the Rails/ActionFilter cop

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

Bootlint integration

Clean up code around commit mentions.

Builds upon !527.

See merge request !528

Revert disallowing usernames to end in period.

cc @JobV @jacobvosmaer

See merge request !545

improve new project options

* Simplify new repo commands
* Include directions for how to add an existing folder that is either
already a repo or not yet a repo

Replaces #7918.

Remove access control for uploaded images to fix broken images in emails

Replaces !530.

> This MR removes the access control for uploaded images. This is needed to display the images in emails again.
>
> The previous solution to base64 encode the images had to be reverted, because not all email clients supported it.
>
> If possible this should go into the 7.10 release.

See merge request !533

Ignore submodules that are defined in .gitmodules but are checked in as directories.

Pulls in gitlab_git 7.1.10 which contains gitlab-org/gitlab_git!26.

Fixes #1439 and https://github.com/gitlabhq/gitlabhq/issues/9140

See merge request !540

Fixed typo in deploy html

do not prepend relative_url_root to avatar

Parse GFM references after sanitizing

Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`.  See #2188.

See merge request !1745

Fix label color input.

Because `value` was set, every label color would render as purple in the form.

Introduced by 83b5a9ae between 7.9 and 7.10, so no changelog item.

See merge request !538

The commit.author.icon variable contains a full URL, which gets broken
when prepended by the relative_url_root setting (generating hrefs like
"/gitlabhttps://...".

Let Bootstrap's tab JS handle history

Closes #2219

See merge request !1784

Revert and re-fix image rendering in help pages

Closes #2212

See merge request !1765