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

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

Add spec to ensure MR diffs are highlighted

Closes #50793

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

CE upstream - 2018-09-01 03:21 UTC

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

CE upstream - 2018-09-01 00:21 UTC

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

Add default parameter to branches API

Closes #32877

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

Move fixture_path out of support/rspec file which is used by fast_spec_helper

Closes #50365

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

Allow auth via JWT (always false in CE)

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

CE upstream - 2018-08-31 09:21 UTC

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

Fix "Confidential comments" button not saving in project hooks

Closes #50440

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

Changes update_column to update_attributes in ProjectTreeRestorer#restore_project by using timeless to maintain the current timestamps

Closes #47765

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

Remove feature flag from BackgroundMigrationWorker

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

Fix git submodule link for subgroup projects with relative path

Closes #37356

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

Fixed IDE file row jumping into view on hover

Closes #50751

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

Resolve "Persistent banner creates problem for web ide"

Closes #46591

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

EE Port (Resolve "Persistent banner creates problem for web ide")

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

Prefer From over Sender in Service Desk

Closes #3189

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

Increase padding in markdown code blocks

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

Merge branch '46673-qa-sanity-tests-fail-with-uninitialized-constant-qa-page-view-pathname-error' into 'master'

Resolve "qa sanity tests fail with 'uninitialized constant QA::Page::View::Pathname' error"

Closes #46673

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

Fix IDE avatar flex sizing style

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

Closes #50751

# Conflicts:
#	doc/administration/compliance.md
#	doc/administration/index.md

[ci skip]

Reorganize issues and merge request feature specs in the same folder

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

Add initial Compliance doc based on features.yml Compliance features

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

Port to EE: New Compliance doc

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

Remove waiting from PDF page component test

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

Move fixture_path out of support/rspec file which is used by fast_spec_helper, so that fast specs can be run on its own again.

Move `fixture_path` config together with use_transactional_fixtures and
use_instantiated_fixtures. These settings are all added by rspec-rails

https://github.com/rspec/rspec-rails/blob/8c6c9590b94916199950dc8a91a9741d3be30c7c/lib/rspec/rails/configuration.rb#L65-L67

CE upstream - 2018-08-30 18:22 UTC

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

# Conflicts:
#	locale/gitlab.pot

[ci skip]