# Conflicts:
#	app/assets/javascripts/reports/components/report_item.vue

[ci skip]

Merge branch '7737-ci-pipeline-view-slowed-down-massivly-if-security-tabs-has-many-entries' into 'master'

Improve performance of rendering large reports

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

Merge branch '7737-ci-pipeline-view-slowed-down-massivly-if-security-tabs-has-many-entries-ee' into 'master'

Improve performance of rendering large reports

Closes #7737

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

CE upstream - 2018-11-06 06:22 UTC

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

Renders unescaped `sprinft` string

Closes #53533

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

Render index.* like README.* when it's present in a directory

Closes #18933

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

Instead of rendering all report items in 4 big lists, we make use of
vue-virtual-scroll-list and render only few dozens at once. This
improves the performance in several metrics:

- Initial load time
- Memory Pressure
- CPU Load
- DOM node count

In an example with around 11k reported security vulnerabilities:

- Initial load time: 27s -> 4.1s
- Memory Pressure: ~750 MB -> ~270 MB
- CPU Load (time spent on executing JS/Rendering): 22s -> 2.5s
- DOM node count: 430k -> 7k up to 30k while scrolling

Instead of rendering all report items in 4 big lists, we make use of
vue-virtual-scroll-list and render only few dozens at once. This
improves the performance in several metrics:

- Initial load time
- Memory Pressure
- CPU Load
- DOM node count

In an example with around 11k reported security vulnerabilities:

- Initial load time: 27s -> 4.1s
- Memory Pressure: ~750 MB -> ~270 MB
- CPU Load (time spent on executing JS/Rendering): 22s -> 2.5s
- DOM node count: 430k -> 7k up to 30k while scrolling

Unique environment scope for clusters belonging to a group

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

Sync `groups` and `group` to fix EE validation

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

Fix save button not activating when original setting started as null

Closes gitlab-ee#8040

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

Store reports fix exception

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

Backport generic methods to CE

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

Includes the way  approvals are handled  to the documentation

Closes #52929

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

Fix failing master

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

Add documentation for the operations dashboard

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

# Conflicts:
#	qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb

[ci skip]

Fixing failing master:
https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/116776474

CE upstream - 2018-11-05 23:21 UTC

Closes gitlab-ce#52176

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

Allow to fetch all pipelines for every projects in a group and its
subgroups.
Allow to fetch the latest pipeline id for each projects of a group and
its subgroups.

docs: fix links for maven from admin to user

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

Rename QA::Factory to QA::Resource

Closes gitlab-ce#53224

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

CE: Rename QA::Factory to QA::Resource

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

# Conflicts:
#	app/assets/javascripts/notes/stores/getters.js
#	app/models/application_setting.rb
#	app/models/commit_status.rb
#	db/schema.rb

[ci skip]

CE upstream - 2018-11-05 12:21 UTC

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

Fix invalid artifact path for codequality

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

Using class= requires an exact match

Performance tuning on Projects::GitHttpController#info_refs

Closes #48239

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

Allow concurrency when using Puma

Closes #53362

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

Remove gitlab-ui's tooltip from global

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