CE upstream - 2018-11-23 15:21 UTC

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

Speed up setting of relative position

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

EE: Promote the GitLab.com Gold trial on a users default dashboard

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

Fix container_scanning job link

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

Refactor landing page EE

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

Add additional requirements to Security Dashboard

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

Delete Research proposal.md

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

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

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

Show a dismissable callout on a users dashboard for a free trial of
the GitLab.com Gold plan. Hide the callout from users who have
dismissed the callout, are already on a trial or are already on the
gold plan

# Conflicts:
#	locale/gitlab.pot

[ci skip]

Resolve "Improve issues list empty state when a filter is selected"

Closes #53326

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

1. When every issue has a relative position set, we don't need to
   perform any updates, or calculate the maximum position in the parent.
2. If we do need to calculate the maximum position in the parent, many
   parents (specifically, groups with lots of projects) leads to a slow
   query where only the index on issues.relative_position is used, not
   the index on issues.project_id. Adding the GROUP BY forces Postgres
   to use both indices.

Explicitly set locale fallbacks

Closes #54274

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

Rails5 deprecation: :nothing option is deprecated, Use head method to respond with empty response body.

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

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

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

Correctly styles tags in jobs sidebar

Closes #54391

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

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

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

The tags were using the `label` class
instead of `bagde` which is the new BS class

Move merge request approval settings

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

Allow commenting to resolved non-diff discussions

Closes #54330

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

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

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

Rails5 deprecation: render :nothing option is deprecated, Use head method to respond with empty response body.

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

Add support for custom highlighting slash commands via warning flags

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

CE upstream - 2018-11-23 07:26 UTC

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

Rails5: env is deprecated and will be removed from Rails 5.1

Closes #54384

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

Fix link in license management documentation

Closes #8536

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

CE upstream - 2018-11-22 19:21 UTC

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