It looks like SIGTERM may not be enough to shut down a Sidekiq process
when its RSS has gotten too big. This change will allow us to experiment
with sending SIGKILL instead of SIGTERM to Sidekiq processes on
gitlab.com.

Fixes for 7.10.2

See merge request !1804

Fix bug where commit data would not appear in some subdirectories

Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example:

https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix)

The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b7) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior.

* Closes #1478, #1459
* Closes https://github.com/gitlabhq/gitlabhq/issues/9037

See merge request !581

Unescape branch names in compare commit

The upgrade in GitLab v7.9 to Rails v4.1.9 caused all branch names in the compare commit mode to be escaped (e.g. `/` to `%2F`). The compare mode would not always work when comparing against branch names with a forward slash.

Opted to unescape the branch name rather than use a wildcard segment to prevent escaping slashes because it seems like a more sensible URL. The slashes in this case aren't really represented by a tree structure (e.g. /compare/one/two/branch..another/branch/here).

* Closes #1399
* Closes https://github.com/gitlabhq/gitlabhq/issues/9105

See merge request !582

Fix DB error when trying to tag a repository

Steps to reproduce: Go to a project settings, add tags, click on save changes

Observed behavior: Error 500

```
    PG::Error: ERROR:  column "taggings_count" does not exist
        LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun...
```

Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first
migration that created the `tags` and `taggings` table, and added the rest.

* Closes #1512
* Closes #1550
* Closes https://github.com/gitlabhq/gitlabhq/issues/6867
* Closes https://github.com/gitlabhq/gitlabhq/issues/9194

See merge request !577

Fix Error 500 when searching Wiki pages

If a Wiki page turns up a hit in the search results, an error will occur:

```
Completed 500 Internal Server Error in 836ms

NoMethodError - undefined method `slug' for "test.markdown":String:
  app/helpers/wiki_helper.rb:10:in `namespace_project_wiki_path'
  app/views/search/results/_wiki_blob.html.haml:4:in `_app_views_search_results__wiki_blob_html_haml___2752621660395393333_70299911622700'
  actionview (4.1.9) lib/action_view/template.rb:145:in `block in render'
  activesupport (4.1.9) lib/active_support/notifications.rb:161:in `instrument'
  actionview (4.1.9) lib/action_view/template.rb:339:in `instrument'
  actionview (4.1.9) lib/action_view/template.rb:143:in `render'
```

An unhandled String containing the name of the Wiki page would be provided to the URL path generator. This MR handles that case.

Closes #1547

See merge request !592

Fix CI links on MR page

Fixes gitlab-org/gitlab-ci#145

See merge request !609

Fix adding new group members from admin area

Fix for #2222

Tests for this case already exists but it was green.
It related to current way dealing with ajax selectbox.
Improving tests might be a reason for another merge requests - everyone is welcome to participate.

See merge request !1796

Get Gitorious importer to work again.

Fixes #1504.

See merge request !576

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

Conflicts:
	db/schema.rb

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