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.

# 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

Alias the lfs_enabled method

Closes #49348

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

Add indexes to all geo event foreign keys

Closes #7955

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

Add note about OpenShift specific configuration

Closes #4584

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

This introduces a new syntax for all licenses and performance jobs:

```yaml
job:
  reports:
    performance: performance.json
    license_management: gl-license-management-report.json
```

Rename 'sast_container' to 'container_scanning' in GITLAB_FEATURES

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

Add RoleBinding method and class

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

Revert "Revert "Update code quality documentation""

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

Because the Geo Event tables do a `on_delete: :cascade`, the foreign
keys in `geo_event_log` need to have an index. Otherwise the deletion
would be very slow.

See
https://docs.gitlab.com/ee/development/migration_style_guide.html#adding-foreign-key-constraints

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7955

Remove broken git storage for testing

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

Add `Any` option to milestone filter

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

Resolve "Filter discussion (tab) by comments or activity in issues and merge requests"

Closes #26723

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

[EE-PORT] Resolve "Filter discussion (tab) by comments or activity in issues and merge requests"

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

This will allow changes in Gitaly that will make it fail when running
rspec, to make it to GitLab.

Else Gitaly won't start as it can't reach the broken storage directory.

Broken storage used to be used to test situations where the Git storage
wasn't being reached. These days we can just mock the Gitaly response.

But given the broken storage is removed now, Gitaly can take over
control of the storage being reachable. If it's not, Gitaly won't boot.
That's nice for situations where a disk wasn't mounted for instance.

Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675

Run karma for qa-* branches

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

Resolve "Removed branch link in pipelines page is broken"

Closes #42611

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