Resolve "Move EE JavaScript tests to their own respective directory"

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

Rake geo:status doesn't report CI job artifact numbers

Closes #7216

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

EE port of 50632-combine-color-duplicates

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

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

Closes #7009

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

Fix rails 5 deprecation warnings

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

Add sorting for labels on labels page

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

Fix workhorse temp path for namespace uploads

Closes gitlab-ee#7009

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

Remove jquery.scss; Combine multiple duplicate grays into global gray variables; Remove unused styles in common.scss

Resolve "Filter bar height changes when items are added"

Closes #49943

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

Rename before_filter to before_action

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

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

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

Resolve "Project export broken when avatar is set"

Closes #51318

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

Fixes rails 5 deprecation warnings in `config/` files

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

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

Add steps for closing product discovery issue

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

QA: Add support for testing Git over HTTP with LDAP users

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

before_filter is deprecated in Rails 5, we should rather
use before_action

Rails 5: fix issue move service

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

CE upstream - 2018-09-11 06:21 UTC

Closes #7543

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

Merge branch '7211-pull-mirroring-does-not-seem-to-replicate-default-branch-all-the-time' into 'master'

Synchronize the default branch when updating a pull mirror

Closes #7211

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

In rails 5, the attributes method for an enum returns the name
instead of the database integer.

QA: Sign in as an admin account when adding a license

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

Add stub methods for FakeApplicationSetting

Closes gitlab-ee#7543

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

Improve exception message when not a secondary

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

In a migration spec, a default ApplicationSetting object may fail to
create due to an unknown attribute and fall back to
FakeApplicationSetting.  FakeApplicationSetting appears to be missing a
number of methods that are needed
(https://gitlab.com/gitlab-org/gitlab-ce/issues/47491). This commit adds
the ones needed to make an EE spec pass.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7543

In a migration spec, a default ApplicationSetting object may fail to
create due to an unknown attribute and fall back to
FakeApplicationSetting.  FakeApplicationSetting appears to be missing a
number of methods that are needed
(https://gitlab.com/gitlab-org/gitlab-ce/issues/47491). This commit adds
the ones needed to make an EE spec pass.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7543