# Conflicts:
#	CHANGELOG.md
#	qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
#	qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
#	qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb

[ci skip]

CE upstream - 2018-08-28 13:21 UTC

Closes gitlab-ce#40059

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

Limit sidekiq-cluster concurrency to a maximum of 50 by default

Closes #7374

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

This reverts commit d50dd3e8.

Fixed typo Post[g]reSQL

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

Move package-and-qa to the test phase

Closes #50718

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

Move package-and-qa to the test phase

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

Resolve "Consider reorganizing the QA scenarios"

Closes #49800

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

[EE] Resolve "Consider reorganizing the QA scenarios"

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

Restore header section in CI doc

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

Resolve "Error getting performance bar results for <UUID>"

Closes #50801

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

This isn't interesting most of the time and is may go over other flash banners.

These don't have performance data saved as they use Grape.

The problem is this: when each phase starts, it checks if all jobs in earlier
phases are complete. package-and-qa is slow. As build is the first phase, if you
trigger package-and-qa before the prepare phase is finished, the entire test
phase will be blocked until package-and-qa completes, which isn't what we want.

But equally, if build came _after_ test, then package-and-qa couldn't be started
until the tests were finished. Putting it in the same stage as the tests means
we can have our cake and eat it.

remove mention of sales email

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

Rails 5: replace removed silence_stream

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

By default, sidekiq-cluster will allocate N threads for N queues specified
on the command line, which in turn will require N + 5 Redis connections.
Especially when used with the `--negate` flag, this can lead to using hundreds
of Redis connections, which can lead to performance issues.

This change also adds a `-m N` option to cap the number of threads. For each
queue group, the concurrency factor will be set to min(number of queues, N).

Closes #7374

Fix rubocop failure on EE projects_spec

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

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

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

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

[ci skip]

[ci skip]

Previously, this wasn't needed: text was normally set to the highlighted
contents anyway. Now, it is: we store different things in text and rich_text.

This caused https://gitlab.com/gitlab-com/production/issues/439.

[ci skip]

[ci skip]

[ci skip]

Closes https://gitlab.com/gitlab-com/migration/issues/766

When backend sends HTML it requires frontend to append it to the DOM causing
XSS vulnerabilities. By removing the `<br>` we avoid those vulnerabilities

Backport `Repository#keep_around` changes from EE to CE

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