CE upstream - 2018-10-23 15:21 UTC

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

EE: Remove unused rails5-variables

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

Limit flash notice width for fixed layout and improve spacing for fluid layout

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

Rails requires a second storage for testing cross shard features. Gitaly
will not boot if this second storage doesn't exist. So this will create
this storage without adding it to the list of storages that Rails knows
about.

Don't use `repository_storage: 'broken'`, but instead use the
`:broken_storage` trait.

They're no longer used and have no effect

Update maven docs

Closes #8032

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

Remove tooltip on sidebar text buttons

Closes #8089

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

Update license_management job definition

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

Adds the security dashboard link

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

Add Security Reports logic

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

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6615 introduced
changes that shouldn't have been merged, but this conflict was a
shortcoming of a prior CE->EE merge.

Correct the docs for last name supported keys field for the SAML SSO assertions.

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

Extend models to provide necessary logic for security reports.
Add Secuirity Reports ruby classes
Add SAST parser
Add logic to store report in database

Merging conflicts for ee_compat_check in !22010

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

Move EE specific code out of the Project model

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

Base MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22010

# Conflicts:
#	app/assets/stylesheets/pages/issues.scss
#	app/models/user.rb
#	db/schema.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-10-22 21:21 UTC

Closes #4302

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

Update Runner Chart to 0.1.35

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

Fix GitLab version for elasticsearch

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

Disable Feature Flags and Packages if repository is disabled

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

This tests permissions when repository is disabled

Add dbname to MySQL migration GRANT command

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

Support licenses and performance

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

EE: Support license management and performance

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

Update Todo icons in collapsed sidebar for Issues and MRs

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