* ee/master:
  Merge branch 'winh-ignore-CVE-2017-5029' into 'master'
  Treat licenses with no plan specified as EES
  Add explicit licensing for Elasticsearch
  removes redundant project pull mirroring code from a bad merge
  Add an optional performance bar to view performance metrics
  Use :request_store hooks on specs
  Override `file_storage` on the `ObjectStoreUploader`
  Update rename_system_namespace_spec to new validations.
  Make the uploader use the updated folder
  Bring in security changes from the 9.2.5 release
  Fix tests on `security-9-2-ee`

Ignore CVE-2017-5029 in Nokogiri

Closes #33597

See merge request !12109

[EE] Add an optional performance bar to view performance metrics

See merge request !2104

removes redundant project pull mirroring code from a bad merge

See merge request !2111

EE Version of 9-2-5 Master security update

See merge request !2094

Add explicit licensing for Elasticsearch

Closes #2581

See merge request !2108

Use :request_store hooks on specs [Backport]

See merge request !2105

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

Add GitLab Geo architecture diagram and clarify LDAP configuration

Closes #2375

See merge request !2098

AWS credentials chain

Closes #2169

See merge request !2020

Avoid using the database in the Geo initializer

See merge request !2099

fix approver placeholder not showing in ie11

Closes #1925

See merge request !2030

don't disable Rebase button for MR without Approvals

Closes #2385

See merge request !2031

Geo - Fix RepositorySyncService when cannot obtain a lease to sync repository

See merge request !2097

CE Upstream - Wednesday

Closes #2563, #2411, gitlab-ce#19219, #2361, and gitlab-ce#31397

See merge request !2060

Make the revision on the `/help` page clickable

See merge request !2089

Fixed not issue boards milestone actions not sticking to bottom of dropdown

Closes gitlab-ce#32002

See merge request !2102

Resolve "ActionView::Template::Error: undefined method `any?' for nil:NilClass"

Closes #2618

See merge request !2090

Closes #32002

For quicker access, add hyperlink to the gitlab.com commits page for the current
REVISION of GitLab.

Fixes deploy board error spec

Closes #2514

See merge request !2064

Normally the storage-stype of an uploader is set on the class level of
an uploader [0] and the `storage` property is initialized from there [1].

In a security release, we were using that at the class level to
determine the path of an upload and whether or not to move it.

In the `ObjectStoreUploader` the storage method is overridden, meaning
that the storage-type set on the class could be different from the
actual storage used.

[0] https://github.com/carrierwaveuploader/carrierwave/blob/f2f8569b1013f601fe7be4b3a616359acd27240d/lib/carrierwave/uploader/configuration.rb#L8
[1] https://github.com/carrierwaveuploader/carrierwave/blob/f2f8569b1013f601fe7be4b3a616359acd27240d/lib/carrierwave/uploader/store.rb#L88

Running `bundle exec rake geo:db:migrate` would cause the warning to show
since ActiveRecord wasn't set up properly.

Add linked pipelines to mini pipeline graph in MR Widget

Closes #2602

See merge request !2039

Closes #2375

[ci skip]

Backports gitlab-ce!12024

See merge request !2092

Merge remote-tracking branch 'origin/system_9_2_security_test_for_ce_to_ee' into 9-2-5-security-update-master

Ran:
 - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
 - git checkout -b 9-2-5-security-patch origin/v9.2.2
 - git apply patchfile.patch
 - git commit
 - [Got the sha ref for the commit]
 - git checkout -b upstream-9-2-security master
 - git cherry-pick <SHA of the patchfile commit>
 - [Resolved conflicts]
 - git cherry-pick --continue