Recover from URI::Error

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

Fixes #2257 and #2260

See merge request !1789

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.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 @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

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`.

ruby 2.1.6

update text to reference new location of setting

update guides for 7.10

See merge request !1779

Fix merge request comments on files with multiple commits

Fix Mention notification level.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2236.

See merge request !527

Having a merge request with a comments on a line which is then changed
in a later commit prevented new comments from properly showing up in the
merge request show page.

 * `Note#set_diff` do not use stored the diff when creating a new note
   in merge requests (we can not be sure the diff did not changed since
   the last comment on that line)
 * Do not rely just on `outdated?` of the first note when displaying
   comments of a MR in the discussion tab, but partition the
   active/outdated notes and display them all
 * In the inline changes tab just select the active notes, so an
   outdated note does not prevent an active one from being rendered
 * Just show active comments in the side-by-side changes tab

Make sure user has access to namespace in import tests.

See merge request !529

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

Fix generating SSH key fingerprints with OpenSSH 6.8.

Replaces https://github.com/gitlabhq/gitlabhq/pull/9008.

Fixes gitlab-org/gitlab-ce#1289.

cc @jacobvosmaer

See merge request !519