Closes https://github.com/gitlabhq/gitlabhq/issues/6745

Fix Atom feeds.

Fixes #1643 and #1644.

See merge request !688

Work around a Chrome 43 bug preventing note editing

Fixes #1568 - and I mean "fixes"

I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11.

See merge request !684

Update CHANGELOG with v7.10.4 changes

See merge request !662

Updated the gitlab_git gem

Moved changelog stuff to the correct release

**Why was this needed?**
The changes are pulled in 7.12.0 but where mistakenly put under 7.11.0

[skip-ci]
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Disabled expansion of top/bottom blobs for new file diffs

**What does this do?**
It updated the version of gitlab_git to the latest version

**Why is this needed?*
There was a bug in rugged (dependency of gitlab_git) that causes a segfault
error when seeding the database. That error has been fixed and the fix is in the
latest version of gitlab_git
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Customize the sanitization whitelist only once

Fixes #1651

See merge request !687

Fixes #1651

Use task_list fork to fix list items in notes

Closes #1645

See https://github.com/github/task_list/pull/60

See merge request !680

workaround for buggy lexers

It seems that some lexers can be buggy when used together with git blame.
This results in a 500 error when a user tries to open the blame page in some cases.
The workaround is pretty simple. Not only fall back to plaintext when the file content can't be guessed, but also when the lexer fails.

This closes #1521 and #1646

/cc @DouweM @JobV It would be awesome to have this in a patch release for 7.11 or even in the release. But that's probably to late.

See merge request !683

Instead of using a fork, we subclass the filter and only apply the
`task-list` class to list items that actually are task lists.

Closes #1645

See https://github.com/github/task_list/pull/60

if something goes wrong, fall back to the plaintext lexer

Add explanation about WIP status to MR form.

![Screen_Shot_2015-05-15_at_13.48.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b3f70585255a043f07c61570549a90ba/Screen_Shot_2015-05-15_at_13.48.49.png)

![Screen_Shot_2015-05-15_at_13.49.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9992708c8ef5ef4fa2bcc2c3173b8e3/Screen_Shot_2015-05-15_at_13.49.01.png)

See merge request !666

Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into jirutka-shell-secret-path

Refactor, simplify and unify helpers for rendering markup

Improve AsciiDoc rendering

See https://github.com/gitlabhq/gitlabhq/pull/9288

How to dump a production DB to staging

See merge request !1825

Fix labels for project/snippet visibility selection

Closes #1626

See merge request !671

Fix default tooltip placement

Made a logic error in 1e1785cc that prevented elements with the `has_tooltip` class from having the default tooltip placement if they didn't define one.

See merge request !674

Explain reset token expiration in emails

Update the new user emails to tell new users when their password reset token expires and provide a link to get a new one.  See #1921.  This MR adds new text to the emails:

```html
This link is valid for X days.  After it expires, you can <a href='new_user_password_url'>request a new one</a>
```

It will be more difficult to add the same link to the error message that's displayed when a user tries to reset his password with an expired token.  Currently, we don't know why the password change fails, we just show the Devise error messages on the form.

See merge request !1803