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>

# 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

0af2ab18 decoubled the `to_param`
behavior from `AtomicInternalId`, but this model was forgotten.

Add top margin to the related merge requests section

Closes #46697

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

Add License Management results in the MR widget

Closes #5487

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

Improve pipeline index action performance by using persisted stages

Closes #43132

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

Resolve "Keyboard shortcuts modal is broken"

Closes #47053

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

Resolve "Geo exposes repository storage paths in HTTP API"

Closes #5380

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

use HTTPS in the example GitLab Page URL

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

# Conflicts:
#   db/schema.rb

Resolve "BS4: Pagination is pipeline's page has no styling"

Closes #46878

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

Fix issue triage policy broken link

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

Resolve "Merge Request > Security Reports > Vulnerability Modal broken with Bootstrap 4 update"

Closes #6228

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

Resolve "Collapsed MR sidebar avatar is not aligned correctly"

Closes #46751

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

Find and mark more Git disk access locations

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