Add custom additional text to emails -- CE backport

Closes gitlab-ee#4474

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

Changed IDE sidebar min width

Closes #44836

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

Merge security fixes to master

See merge request gitlab/gitlabhq!2369

Export and import LFS objects

Closes #40643

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

Move ListCommitsByOid to OPT_OUT

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

This makes accessing LFS Objects for a project easier

  project.lfs_storage_project.lfs_objects`

becomes

  project.all_lfs_objects

This will make the refactor in
https://gitlab.com/gitlab-org/gitlab-ce/issues/39769 easier to deal
with.

Downloading the stream directly to the archive. In order to avoid
conflicts with the cache.

If the LFS object already exist, we'll link it tot he existing one, if
not we'll create it.

The LFS files will be included in the `lfs-objects` directory in the archive.

Fix 404 in group boards when moving issue between lists

Closes #44551

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

[Rails5] Add rails5 jobs to gitlab-ci.yml

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

[10.6] Prevent notes on confidential issues from being sent to chat

See merge request gitlab/gitlabhq!2366
# Conflicts:
#	app/helpers/services_helper.rb

Port of "Fix XSS on commit diff view" for 10-6

See merge request gitlab/gitlabhq!2364

Escape miletone attribute when appending to the DOM

See merge request gitlab/gitlabhq!2359

Fix typo in application settings page

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

Resolve "ActiveRecord::RecordNotUnique: PG::UniqueViolation: ERROR:  duplicate key value violates unique constraint "index_ci_builds_meta..."

Closes #44922

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

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

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

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

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

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

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

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

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

Acceptence testing was successfull in
[#844](https://gitlab.com/gitlab-org/gitaly/issues/844)

Part of gitlab-org/gitaly#670

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