Conflicts:
   app/models/ci/pipeline.rb
   app/serializers/pipeline_details_entity.rb
   spec/serializers/pipeline_serializer_spec.rb

This replaces remaining usage of `have_html_escaped_body_text` matcher that has been removed.

Resolve "Web IDE Status Bar is broken when System footer is present"

Closes #6305

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

Resolve "Breadcrumb hidden by system message"

Closes #6313

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

Rename Secret variables -> variables

Closes gitlab-ce#38479

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

[EE-Port] GraphQL setup: Basic Project and Merge request endpoint

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

Add .NET to what's supported by SAST

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

- All definitions have been replaced by classes:
  http://graphql-ruby.org/schema/class_based_api.html
- Authorization & Presentation have been refactored to work in the
  class based system
- Loaders have been replaced by resolvers
- Times are now coersed as ISO 8601

Pipeline index performance improvements / EE

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

Show status information stale icon in Geo admin dashboard

Closes #4909

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

 Conflicts:
   app/models/ci/pipeline.rb

Extract EE specific files/lines for app/controllers/groups

Closes #5941

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

Fix MR tabs bottom border (EE)

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

# Conflicts:
#	Gemfile.rails5.lock
#	app/assets/stylesheets/bootstrap_migration.scss
#	app/models/ci/pipeline.rb
#	app/models/personal_snippet.rb
#	app/services/application_settings/update_service.rb
#	db/schema.rb
#	doc/user/project/import/github.md
#	locale/gitlab.pot
#	spec/serializers/pipeline_serializer_spec.rb
#	spec/uploaders/object_storage_spec.rb

[ci skip]

Fix repository archive generation when hashed storage is enabled

Closes #45702

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

Fix transfer project namespace field

Closes #47345

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

Fix header styles

Closes #46704 and #46697

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

fix attach button cursor

Closes #46713

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

CE upstream - 2018-06-04 14:04 UTC

Closes #3691

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

Update _destroy.haml

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

Revert "Merge branch 'jivl-add-top-margin-related-merge-requests' into 'master'"

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

This reverts merge request !19379

Fix group activity border to extend under RSS link

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