Recover from URI::Error

`URI::Error` is the base class for all URI errors.

Fixes #2257 and #2260

See merge request !1789

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

Conflicts:
	VERSION

Fix tab behavior on MergeRequests#new

Missed this one in 269aee79

Prior to this fix, clicking the Commits or Changes tab when creating a new MR would reload the page instead of display the tab contents.

See merge request !556

Update gitlab-grack to 2.0.2.

Updating to grack version 2.0.2 to fix an issue with smart http clients.

See merge request !559

7 10 rc5 ee

cc @job

See merge request !376

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

Conflicts:
	VERSION

7.10.0.rc5

cc @job

See merge request !1787

7.10 requires gitlab-shell 2.6.2.

Fixes #1467.

See merge request !552

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

Fix some issues with Google Code importer

Thanks, @mrtux, for reporting all of these.

See merge request !551

Revert and re-fix image rendering in help pages

Closes #2212

See merge request !1765

Changes for 7.10.0.rc4

cc @job

See merge request !374

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

Conflicts:
	VERSION

Changes for 7.10.0.rc4

cc @job @douwe

See merge request !1785

Revert disallowing usernames to end in period.

cc @JobV @jacobvosmaer

See merge request !545

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

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

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

Conflicts:
	VERSION
	app/models/project.rb
	db/schema.rb

Fixes for 7.10.0.rc3

content

- [ ] Update gitlab_git to ignore invalid lines in .gitmodules.
- [ ] Add a task that checks repository integrity with `git fsck`.
- [ ] Decrease memory use and increase performance of Google Code importer.
- [ ] Fix username period migration to preserve uniqueness of names and paths.

See merge request !1783

Decrease memory use and increase performance of Google Code importer.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2241.

See merge request !536

Add a task that checks repository integrity with `git fsck`.

Ce update guides

See merge request !373