# Conflicts:
#	app/assets/javascripts/pages/groups/issues/index.js
#	app/views/admin/application_settings/show.html.haml
#	doc/user/project/labels.md

[ci skip]

Resolve "NoMethodError: undefined method `log_info' for Geo::RepositorySyncWorker"

Closes #5555

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

Fix links to subdirectories of a directory with a plus character in its path

Closes #44967

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

Bulk deleting refs is handled by Gitaly by default

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

Allow an alternate incoming email address for GitLab.com

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

CE upstream - 2018-04-04 15:28 UTC

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

Redesign application settings to match project settings (part 6, final)

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

Redesign application settings to match project settings (part 6, final)

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

Has been stable for a while in production, so this endpoint grew out if
OPT_IN, the default state.

Part of https://gitlab.com/gitlab-org/gitaly/issues/526

Render MR commit SHA instead "diffs" when viable on GFM

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

[https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18141 Port] Render MR commit SHA instead "diffs" when viable on GFM

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

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>

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

Resolve "Transient failure in spec/features/projects/issues/user_sorts_issues_spec.rb"

Closes #44983

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

Allow assigning and filtering issuables by ancestor group labels

Closes #40915

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

EE-PORT Allow assigning and filtering issuables by ancestor group labels

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

This is temporary, until we switch completely:
https://about.gitlab.com/2018/03/06/reconfigure-inbound-email-for-gitlab-notification/

# Conflicts:
#	changelogs/unreleased/39880-merge-method-api.yml
#	doc/api/projects.md
#	lib/api/projects.rb
#	spec/requests/api/projects_spec.rb

[ci skip]

Fix syntax error in the `Envoy.blade.php` example

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

Add banzai filter to detect commit message trailers and properly link the users

Closes #31640

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

CE upstream - 2018-04-04 09:39 UTC

Closes gitaly#1110

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

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

Add support for Sidekiq JSON logging

Closes #20060

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

Revert "Allow CI/CD Jobs being grouped on version strings"

Closes #44615

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

Allow feature gate removal through the API

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