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

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

Update Elasticsearch URL description with example on using basic auth

Closes #4694

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

uploads.md: Fix incorrect path reference

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

Enable even more frozen string in app/controllers

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

CE upstream - 2018-09-26 09:26 UTC

Closes gitlab-ce#51729

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

Docs: Update deploy token example to use https

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

docs: link to repo check failures

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

Preserve order of project tags list

Closes #51839

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

Correct GitLab capitalization in CE Translation files

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

Correct GitLab capitalizations in translations - EE Port

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

Resolve "Commit details are not displayed when reviewing an MR commit by commit"

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

Added cpp documentation for junit integration.

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

Work around a bug in Rails 5, where LIMIT causes trouble

Closes #51729

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

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

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

fix board list vertical scroll bar always shows up

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

Enables frozen string for some vestigial files as
well as the following:

* app/controllers/projects/**/*.rb
* app/controllers/sherlock/**/*.rb
* app/controllers/snippets/**/*.rb
* app/controllers/users/**/*.rb

Partially addresses #47424.

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

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

Add link component from gitlab-ui

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

Resolve "Geo::RepositoryVerification::Secondary::ShardWorker lease key is not namespaced by shard name"

Closes #7722

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

Resolve "Geo::RepositoryVerification::Secondary::ShardWorker lease key is not namespaced by shard name"

# Conflicts:
#	app/models/project_feature.rb
#	db/schema.rb

[ci skip]

CE upstream - 2018-09-25 15:25 UTC

Closes gitlab-ce#51695 and #7728

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

Dedupe frontend dependencies

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

The test was failing
https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/101444126 because
https://gitlab.com/gitlab-org/gitlab-ee/blob/a04056efad6639420b469eced5130751a8cf2757/ee/spec/support/request_store.rb
which is in EE only, clears the RequestStore before every test,
regardless of whether RequestStore is active. This test is unusual
because it sets up RequestStore without it being active, to make sure
that the tested code doesn’t attempt to use RequestStore. These two
unusual facts combined to cause the failure in EE only. The fix works
because of the particular order of RSpec hooks in the test lifecycle.

Add gitlab-ui skeleton loading

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

Downgrade Exclusive Lease warnings from Geo Log Cursor to debug

Closes #6428

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