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

**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

[QA] Extend create_merge_request_spec to set assignee to MR

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

Upgrade to workhorse 7.6.0:

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

Avoid caching BroadcastMessage as an ActiveRecord object

Closes #55034

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

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

Closes gitlab-org/release/framework#21

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

There is a combination of few strategies implemented here:

1. Few relations were eager loaded
2. Changed few polymorphic routes to specific ones so we don't have to
   use `#becomes(Namespace)` which doesn't preserve association cache

Improve feature proposal template for improved product thinking

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

Add Rails.version to the Geo cache keys

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

Previously, the GitHub importer would only work if the site configured
an OAuth2 provider were configured. Users attempting to import via a
GitHub personal access token would see an Error 500 due to a failed
redirection. We fix this by only doing the redirection if the provider
has been configured and allowing users to see the new import page.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/38524

Bump sentry-raven gem to 2.7.4

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

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

Closes gitlab-ce#55079 and gitaly#1425

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

Fix profile_header bottom margin, #51807.

Closes #51807

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

Resolve "Main navbar is broken in certain viewport widths"

Closes #49713

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

Sends only one notification per batch review

Closes #4326

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