CE upstream - 2018-02-13 15:25 UTC

See merge request gitlab-org/gitlab-ee!4512

Replace $.ajax with axios in mirror pull

See merge request gitlab-org/gitlab-ee!4474

Replace $.post with axios in initPathLocks

See merge request gitlab-org/gitlab-ee!4516

Resolve "Geo: If repo was set to be redownloaded once it will be redownloaded always"

Closes #4919

See merge request gitlab-org/gitlab-ee!4506

Resolve "Background upload option is not effective"

Closes #4915

See merge request gitlab-org/gitlab-ee!4507

Remove unnecessary weightSelect from initLegacyFilters

See merge request gitlab-org/gitlab-ee!4513

Replace $.ajax with axios in approvers select

See merge request gitlab-org/gitlab-ee!4476

Remove unused code in profile.js

See merge request gitlab-org/gitlab-ce!17009

Remove problematic LDAP::Person validation for new strategy

Closes #42412 and #42359

See merge request gitlab-org/gitlab-ce!16727

Dont run :geo specs in EE steps. They run in specific Geo only.

See merge request gitlab-org/gitlab-ee!4514

Remove Sentry reporting for query limiting

See merge request gitlab-org/gitlab-ce!17092

Fix settings panels not expanding when fragment hash linked

Closes #43198

See merge request gitlab-org/gitlab-ce!17074

Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)

Closes gitlab-ce#40994

See merge request gitlab-org/gitlab-ee!4393

Fully enable nginx-ingress metrics

Closes #43189

See merge request gitlab-org/gitlab-ce!17069

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

Resolve "Links in issue board are broken"

Closes #4911

See merge request gitlab-org/gitlab-ee!4494

Port spec/fixtures/api/schemas/deployment.json from EE

See merge request gitlab-org/gitlab-ce!17090

See https://gitlab.com/gitlab-org/gitlab-ce/issues/43198

Using Sentry, while useful, poses two problems you have to choose from:

1. All errors are reported separately, making it easy to create issues
   but also making it next to impossible to see other errors (due to the
   sheer volume of threshold errors).

2. Errors can be grouped or merged together, reducing the noise. This
   however also means it's (as far as I can tell) much harder to
   automatically create GitLab issues from Sentry for the offending
   controllers.

Since both solutions are terrible I decided to go with a third option:
not using Sentry for this at all. Instead we'll investigate using
Prometheus alerts and Grafana dashboards for this, which has the added
benefit of being able to more accurately measure the behaviour over
time.

Note that throwing errors in test environments is still enabled, and
whitelisting is still necessary to prevent that from happening (and that
in turn still requires that developers create issues).

Remove allow_n_plus_1 block from Network::Graph

Closes #37436 and gitaly#998

See merge request gitlab-org/gitlab-ce!17087

Remove allow_n_plus_1 block from DeleteMergedBranchesService

Closes #37438 and gitaly#999

See merge request gitlab-org/gitlab-ce!17058

Move all `spec/ee/spec/*` files to `ee/spec/`

See merge request gitlab-org/gitlab-ee!4231

Fixes hover style for lock merge request edit link

Closes #42580

See merge request gitlab-org/gitlab-ce!17065

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

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

Document all_queues.yml in sidekiq_style_guide.md

See merge request gitlab-org/gitlab-ce!17079

Constructors shouldn't throw exceptions. We also learned that
different LDAP servers behave a bit unexpectedly sometimes -
returning attributes we didn't ask for, or returned attributes
with language subtypes.

Group MR numbers on issue show page by project and namespace

Closes #26466

See merge request gitlab-org/gitlab-ce!8494

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

Closes #26466.

Fix artifact creation in CI/CD QA spec

See merge request gitlab-org/gitlab-ce!17078