CE upstream - 2018-11-12 16:21 UTC

Closes gitlab-ce#53781

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

# Conflicts:
#	.gitlab-ci.yml
#	doc/user/markdown.md

[ci skip]

CE upstream - 2018-11-12 10:21 UTC

Closes #8390

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

Bump redis-store to 1.6.0

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

Bump mime-types to 3.2.2

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

[EE] Comment on any expanded diff line on MRs (with feature-flag)

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

Comment on any expanded diff line on MRs (with feature-flag)

Closes #13950

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

Set an empty entrypoint for license_management job

Closes #53786

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

Remove unnecessary job dependencies

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

Remove unnecessary job dependencies

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

Changed diff tree filtering to path

Closes #53781

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

Resolve "View issue button doesn't work in dashboard modal"

Closes #8370

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

Improve initial rendering of discussion notes

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

Previously it was using name which could make it hard
to filter for the file you want in a certain folder.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53781

Upgrade whitequark/parser to 2.5.3.0

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

Docs: updates docs development guidelines

Closes #53160 and #53115

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

Docs: update docs development guidelines

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

Dangerbot: mention tech writers based on DevOps stage

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

Bump Sidekiq and other related gems

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

Rails 5 counterpart to the version update from
7fb30b4c

# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock

[ci skip]

Fix  ./spec/features/issues/user_views_issue_spec.rb

Closes gitlab-ee#8390

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

Add Discord integration

Closes #21635

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

Disable usage pings in review apps

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

Disable usage pings in review apps

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

CE upstream - 2018-11-12 09:21 UTC

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

Merge branch '53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup' into 'master'

Update gitlab-markup gem to avoid binary name collision

Closes #53082

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

Merge branch 'ee-53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup' into 'master'

Update gitlab-markup gem to avoid binary name collision

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

Fix some links and Markdown

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

CE upstream - 2018-11-12 00:21 UTC

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