# Conflicts:
#	app/services/users/build_service.rb
#	locale/gitlab.pot

[ci skip]

Backport doc/user/group/img/groups.png changes from EE

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

CE upstream - 2018-08-30 12:21 UTC

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

Add changelog entries for 11.2.3 and 11.1.6

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

Allow whitelisting for "external collaborator by default" setting

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

Allow whitelisting for "external collaborator by default" setting

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

Fixed project logo when it is LFS tracked

Closes #47229

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

Resolve "Users stuck on a redirect loop after transferring project"

Closes #41292

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

Resolve "Make a Rubocop cop to prefer class_methods over ClassMethods for ActiveSupport::Concern"

Closes #50414

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

CE Port 50414 rubocop rule to enforce class methods over module

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

Updates hint text for merging branches locally.

Closes #39398

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

Fix Error 500s due to encoding issues when Wiki hooks fire

Closes #50590

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

- Hint essentially states that a user should first update their target branch
  with upstream changes and then perform the merge.

CE upstream - 2018-08-30 00:21 UTC

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

Resolve "Show number of pods deployed on Deploy Boards"

Closes #5906

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

CE upstream - 2018-08-29 20:05 UTC

Closes #2695 and gitlab-com/migration#766

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

Fix Emojis cutting in the right way

Closes #47913

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

# 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.

These changes were introduced in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6622
but should have originated in CE.

Fixed typo Post[g]reSQL

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

Saved Wiki content goes through the GitalyClient::WikiService, which calls
StringIO#set_encoding on the input stream. The problem is that this call
mutates the encoding of the given string object to ASCII-88BIT, which
causes problems for models expecting the data to still be in UTF-8.

Freezing the input disables this behavior:
https://github.com/ruby/ruby/blob/v2_4_4/ext/stringio/stringio.c#L1583

Closes #50590

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