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.

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

CE upstream - 2018-11-22 16:22 UTC

Closes gitlab-ce#53019 and gitlab-ce#48816

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

Clear BatchLoader context between Sidekiq jobs

Closes #53079

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

Update Runner Chart to 0.1.38

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

# Conflicts:
#	.gitlab-ci.yml
#	db/migrate/20161007073613_create_user_activities.rb
#	db/post_migrate/20161128170531_drop_user_activities_table.rb

[ci skip]

Include wildcard for `gitlab:assets:compile` only parameter

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

Documentation: Correct blocked SMTP ports for GKE

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

Add specs for entities autocomplete

Closes #48534

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

More env vars for group & project names in QA

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

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

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

Made diff file headers sticky

Closes #48816

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

This will help with https://gitlab.com/gitlab-org/gitlab-qa/issues/349
as we need to use much shorter project and group names for HTTPS to work

Add rails version to all migrations

Closes #54098

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

[EE] Add rails version to all migrations

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

Show toggle tree button on merge request commits

Closes #53019

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

Limit `gitlab:assets:compile` job to branches and tags

Closes #54361

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

# Conflicts:
#	locale/gitlab.pot

[ci skip]

Limit `gitlab:assets:compile` job to branches and tags

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

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

Closes gitlab-ce#52699, gitlab-ce#53571, and gitlab-ce#51220

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

Fix typos occured to occurred

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

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551

Resolve "`fetch-assets` job times out so `package-and-qa` jobs can't complete"

Closes #54293

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

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