Merge branch 'ee-55183-frozenerror-can-t-modify-frozen-string-in-app-mailers-notify-rb' into 'master'

[EE] Fix a potential frozen string error in app/mailers/notify.rb and add tests for Service desk emails

Closes gitlab-ce#55183

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

CE upstream - 2018-12-11 13:21 UTC

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

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

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

Add missing links to resources

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

Docs: how the global nav works

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

CE upstream - 2018-12-11 12:21 UTC

Closes gitlab-ce#38524

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

Remove deprecated `vlink` class

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

Migrate emoji_menu_spec.js to Jest

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

Update E2E tests to account for Project overview UI changes

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

Fix MR pipelines run on only: regexp

Closes #55026

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

Add more structured JSON logging to Kubernetes classes

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

see https://jestjs.io/docs/en/configuration.html#restoremocks-boolean

CE upstream - 2018-12-11 10:21 UTC

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

Allow GitHub imports via token even if OAuth2 provider not configured

Closes #38524

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

Make commit IDs in merge request discussion header monospace

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

CE upstream - 2018-12-11 08:21 UTC

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

Fix some N+1 queries related to Admin Dashboard, User Dashboards and Activity Stream

Closes #55106

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

Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'"

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

Fix MR discussion counts being off

Closes #55138

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

This reverts commit 793be43b, reversing
changes made to 8d0b4872.

For projects not using any CI, enabling merge only when pipeline succeeds
caused merge requests to be in unmergeable state, which caused significant
confusion.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/55144 for more details.

CE upstream - 2018-12-10 23:21 UTC

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

CE upstream - 2018-12-10 22:21 UTC

Closes gitlab-ce#55034

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

Update the .gitignore

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

- Split logger call for readibility
- Reduce code duplication by adding new method

**What was the issue?**
Notes can be unresolved, but not resolvable. Without this, the
unresolvedDiscussionsCount was inflated.

**References**
https://gitlab.com/gitlab-org/gitlab-ce/issues/55138

Update License info for 11.6 feature freeze

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