Rails5 fix duplicate gpg signature in path lock spec

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

Rails5: fix mysql milliseconds problem in project_spec

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

Rails5: fix mysql milliseconds problem in project_import_state_spec

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

Resolve "Extract EE specific files/lines for Discussion app/helpers"

Closes #6676

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

Ee 25990 interactive web terminals for ci cd jobs docs

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

CE upstream - 2018-08-17 09:22 UTC

Closes gitaly#1243, gitaly#1310, and gitaly#1246

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

Remove duplicate test

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

Remove more variable reassignments and unused styles

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

Double the concurrency of rspec-*-ee* jobs

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

EE: blacklist the use of destroy_all

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

EE-port of " GitHub importer: Keep track of internal_ids "

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

[EE] Fix SiteStatistics wikis_count

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

Resolve "Unable to see system header and footer form with Ultimate license"

Closes #7255

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

Port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21248

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

port of CE MR - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21248

This reverts commit ad2af8f8.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/49446.

# Conflicts:
#	app/finders/license_template_finder.rb
#	app/services/groups/destroy_service.rb
#	app/views/admin/application_settings/show.html.haml
#	doc/administration/index.md
#	doc/user/project/import/index.md
#	doc/user/project/import/manifest.md
#	locale/gitlab.pot
#	spec/javascripts/vue_shared/translate_spec.js

[ci skip]

Remove feature flags for UserUpdateBranch

Closes gitaly#1246 and gitaly#1310

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