The other one is 3 lines below the removed.

"Reply quoting selected text" shortcut/hotkey

Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms.

This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs.

See merge request !1775

Add Fieldset Support to Project Services Views

Update command in upgrader docs to work with 7.10.0.

See merge request !562

split field logic to separate template.

Updated Slack documentation

Fixes #2234

Updated the Slack documentation to include the new fields located in the service's settings.

/cc @karen

See merge request !1788

Recover from URI::Error

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

Fixes #2257 and #2260

See merge request !1789

add 7.9-7.10 upgrade doc

See merge request !560

Fix user API tests succeeding for the wrong reason

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

Remove html-pipeline-gitlab

Ports the custom emoji filter to the app itself.

See merge request !1781

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

Make issue preview look like the result

do not send empty message to hipchat

The requests were missing multiple required attributes, while testing for single attribute missing.
Added test for checking username as required attribute.

Fixes #2257
Fixes #2260

Didn't like relying so much on Regex matches

Removes emoji-centric tests from GFM specs 💥

Convert GFM reference handling to html-pipeline filters

- `Gitlab::Markdown` is now much cleaner
- Better separation of concerns
- Cleaner, less brittle, more maintainable specs for each reference type.
- Label references actually work!

See merge request !1753

add environment variable force to the documentation

Remove entry that was shipped in v7.9.1

See merge request !532

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