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

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

[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

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

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>

Prevent regular users from moving projects to different storage shards (master)

See merge request gitlab/gitlab-ee!653

[master] Missing CSRF in System Hooks resend action

See merge request gitlab/gitlab-ee!658

[ci skip]

[ci skip]

[ci skip]

[ci skip]

Docs: custom project templates - fix page title

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

# Conflicts:
#	db/schema.rb
#	doc/api/issues.md
#	doc/user/group/img/groups.png
#	doc/user/project/img/labels_list.png
#	locale/gitlab.pot

[ci skip]

Merge branch '50441-high-number-of-statement-timeouts-in-groupdestroyworker-due-to-sitestatistics' into 'master'

Resolve "High number of statement timeouts in GroupDestroyWorker due to SiteStatistics"

Closes #50441

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

Fix static analysis

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

Rails5: fix can't quote ActiveSupport::HashWithIndifferentAccess

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

Allow date parameters on Issues, Notes, and Discussions API for group owners

Closes #40059

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

Allow date parameters on Issues, Notes, and Discussions API for group owners

Closes gitlab-ce#40059

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

Allow disable packages feature per project

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

Display default status emoji if only message is entered

Closes #50067

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