Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474

Conflicts:
	db/schema.rb
	ee/app/controllers/ee/admin/application_settings_controller.rb
	ee/app/helpers/ee/application_settings_helper.rb
	ee/app/models/ee/application_setting.rb
	ee/app/models/license.rb
	ee/app/views/layouts/service_desk.html.haml
	ee/app/views/notify/approved_merge_request_email.html.haml
	ee/app/views/notify/service_desk_new_note_email.text.erb
	ee/app/views/notify/service_desk_thank_you_email.text.erb
	ee/app/views/notify/unapproved_merge_request_email.html.haml
	ee/lib/ee/api/entities.rb
	ee/spec/controllers/admin/application_settings_controller_spec.rb
	ee/spec/models/application_setting_spec.rb
	ee/spec/requests/api/settings_spec.rb
	lib/api/settings.rb
	spec/mailers/previews/notify_preview.rb

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

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

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

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

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

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

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

This reverts commit 4f2cdb51.

Closes #20060

Added pending tabs to IDE

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

Resolve "Protected branches count is wrong when a wildcard includes several protected branches"

Closes #20394

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Use standard codequality job

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

Resolve "Allow the configuration of a project's merge method via the API"

Closes #39880

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Redesign application settings to match project settings (part 5)

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

Use shard name in Git::GitlabProjects instead of shard path

Closes gitaly#1110

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

[Rails5] Rename `sort` methods to `sort_by_attribute`

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

Add better LDAP connection handling

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

[Rails5] Update Gemfile.rails5.lock

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

Handle invalid params when trying update_username

Closes #44925

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

Added comment for `key` usage

Resolve "Cancel icons in pipeline dropdowns are misaligned"

Closes #41224 and #37318

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

Using strong params to require the presence of a username when calling
`update_username`. Otherwise we'd raise a `NoMethodError` validating
the paths on disk.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Redesign application settings to match project settings (part 4)

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