Merge branches 'fix/import-data-issue' and 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-data-issue

Remove Rails monkey-patches now that we're using Rails 4.2.6

Closes #17356.

See merge request !4115

Improve log message when a project is destroyed to include the namespace

See merge request !4114

Restrict starred projects to viewable ones

`User#starred_projects` doesn't perform any visibility checks. This has
a couple of problems:

1. It assumes a user can always view all of their starred projects in
   perpetuity (project not changed to private, access revoked, etc.).
2. It assumes that we'll only ever allow a user to star a project they
   can view. This is currently the case, but bugs happen.

Add `User#viewable_starred_projects` to filter the starred projects by
those the user either has explicit access to, or are public or
internal. Then use that in all places where we list the user's starred
projects.

Closes #17249.

See merge request !4108

Only generate repository push email once

The repository push email can be very expensive to generate, especially
with syntax-highlighted diffs. Instead of generating the email for each
recipient, generate one email object and reset the Message-Id and To
headers for each recipient. (Cloning would also be expensive in the case
of large emails, although probably not as bad as generating from
scratch.)

Closes #17270.

See merge request !4070

Updated 8.7.4 CHANGELOG entries

See merge request !4116

[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>

Enable Rubocop Casecmp Performance Cop.

Also fixes the errors caused by enabling the cop.

`casecmp` is more performant than `.downcase` and `==`.

See also: https://github.com/bbatsov/rubocop/blob/master/lib/rubocop/cop/performance/casecmp.rb

See merge request !3957

Enable the StringReplacement cop.

Also fix one use of `gsub` that would be faster as `delete`.

Use `tr` instead of `gsub` when you are replacing the same number of characters. Use `delete` instead of `gsub` when you are deleting characters.

See merge request !3960

The repository push email can be very expensive to generate, especially
with syntax-highlighted diffs. Instead of generating the email for each
recipient, generate one email object and reset the Message-Id and To
headers for each recipient. (Cloning would also be expensive in the case
of large emails, although probably not as bad as generating from
scratch.)

Removes jquery-scrollto-rails.

Instead the script is now included directly from the vendor directory.

Resolves #17166. Working towards #14286 and merging !3775.

The gem was on 1.4.3.1, here's the diff between that tag and 2.1.2 (the version I'm using in this MR): https://github.com/flesler/jquery.scrollTo/compare/1.4.3...2.1.2

There aren't any notable breaking changes that I noticed, and I didn't see any JS errors after testing a bunch of pages.

cc: @jschatz1 

See merge request !4088

Also fix one use of `gsub` that would be faster as `delete`.

Use `tr` instead of `gsub` when you are replacing the same number of
characters. Use `delete` instead of `gsub` when you are deleting
characters.

Instead the script is now included directly from the vendor directory.

Resolves #17166.

Also fixes the errors caused by enabling the cop. casecmp is more performant than `.downcase` and `==`.

Restore "r" shortcut

Fixes "Reply with Selected Text" shortcut

See merge request !4041

Add eager load paths to help prevent dependency load issues with Sidekiq workers

_Originally opened at !3545 by @stanhu._

- - -

Relevant resources:

- https://github.com/mperham/sidekiq/wiki/FAQ#why-doesnt-sidekiq-autoload-my-rails-application-code
- https://github.com/mperham/sidekiq/issues/1281#issuecomment-27129904
- http://blog.arkency.com/2014/11/dont-forget-about-eager-load-when-extending-autoload
- https://github.com/rails/rails/blob/52ce6ece8c8f74064bb64e0a0b1ddd83092718e1/railties/lib/rails/engine.rb#L472-L479
- https://github.com/rails/rails/blob/v4.2.6/railties/lib/rails/paths.rb

Attempts to address #3661, #11896, #12769, #13521, #14131, #14589, #14759, #14825.

See merge request !3724

Update Ace Editor

Upgrading fixes scroll navigation on mobile.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13987

![scroll](/uploads/fd655fa6033ddc0337080c89c3fbf92f/scroll.gif)

See merge request !3823

Fix an issue when filtering merge requests with more than one label

Fixes #15529.

See merge request !3886

Add to label ID to response

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15673

See merge request !4023

`User#starred_projects` doesn't perform any visibility checks. This has
a couple of problems:

1. It assumes a user can always view all of their starred projects in
   perpetuity (project not changed to private, access revoked, etc.).
2. It assumes that we'll only ever allow a user to star a project they
   can view. This is currently the case, but bugs happen.

Add `User#viewable_starred_projects` to filter the starred projects by
those the user either has explicit access to, or are public or
internal. Then use that in all places where we list the user's starred
projects.

Remove broken inline runner description edit form

This remove inline form for editing runnner's description.

It is broken because of missing partial / incorrect response and it also does not make much sense, since we have under 'Edit' button a form that makes it possible to edit more than just a description.

See merge request !4095

Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix using link to uploads in global snippets

Closes #17342, closes #17363

See merge request !4085

Closes #17342, closes #17363

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

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