# 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

CI randomly fails with:
    ActiveRecord::RecordNotFound:
       Couldn't find Project with 'id'=724

This is probably caused by DB cleanup strategy used for :js
tests in combination with `set`.

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8394

Update URLs to better ones

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

Fix link for raising helm chart issues

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

Add link in K8s integration docs to RBAC roles

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

# Conflicts:
#	doc/ci/examples/deployment/composer-npm-deploy.md
#	doc/development/documentation/styleguide.md

[ci skip]

Docs: Update Variable naming - EE Port

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

Docs: Update Variable naming

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

See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082

See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082

CE upstream - 2018-11-11 17:21 UTC

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

Fix error handling bugs in kubernetes integration

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

CE upstream - 2018-11-09 23:30 UTC

Closes gitlab-org/release/framework#48 and gitlab-ce#53773

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

# Conflicts:
#	app/views/clusters/clusters/_sidebar.html.haml
#	lib/gitlab/background_migration/redact_links.rb
#	locale/gitlab.pot

[ci skip]

Use gitlab-ui in jobs and pipelines

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