# Conflicts:
#	app/controllers/application_controller.rb
#	app/controllers/projects/issues_controller.rb
#	app/controllers/projects_controller.rb
#	app/views/projects/commits/_commit.html.haml
#	doc/README.md
#	locale/gitlab.pot
#	spec/models/project_spec.rb

[ci skip]

[11.5] Fix SSRF in project integrations

See merge request gitlab/gitlabhq!2611

[master] Resolve: "Provide email notification when a user changes their email address"

See merge request gitlab/gitlabhq!2587

[master] Resolve "Reflected XSS in OAuth Authorize window due to redirect_uri allowing arbitrary protocols"

See merge request gitlab/gitlabhq!2572

[master] Fix CRLF issue in UrlValidator

See merge request gitlab/gitlabhq!2627

[master] Resolve "Personal access token with only `read_user` scope can be used to authenticate any web request"

See merge request gitlab/gitlabhq!2583

[master]Fixed ability to comment on and edit/delete comments on locked or confidential issues

See merge request gitlab/gitlabhq!2612

[master] [pages] Possible symlink time of check to time of use race condition

Closes #2742

See merge request gitlab/gitlabhq!2638

[master] XSS in markdown following unrecognized HTML element

Closes #2732

See merge request gitlab/gitlabhq!2599

[master] Fix XSS in mermaid diagrams

See merge request gitlab/gitlabhq!2597

[master] Don't expose confidential information in commit message list

See merge request gitlab/gitlabhq!2626

[master] Resolve: Promoting a milestone is missing an authorization check

See merge request gitlab/gitlabhq!2598

[master] Do not follow redirects in prometheus service

See merge request gitlab/gitlabhq!2617

[master] Stored XSS for Environments

Closes #2727

See merge request gitlab/gitlabhq!2594

[master] Fixed read private group names

See merge request gitlab/gitlabhq!2589

[Master] Redact sensitive information on gitlab-workhorse log

See merge request gitlab/gitlabhq!2584

CE upstream - 2018-11-28 18:21 UTC

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

Externalize strings from `/app/views/snippets`

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

Make add_reference cop accept a hash for :index

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

Bump GitLab Workhorse to 7.2.1

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

Force better alignment in tables

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

Force better alignment in tables

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

Include new and edit links in breadcrumb for project milestones, group milestones, and labels

Closes #43998

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

Improve detail of resolve conflict docs

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

Add monkey patch to unicorn to fix eof? problem

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

https://gitlab.com/gitlab-org/gitlab-workhorse/blob/master/CHANGELOG

# Conflicts:
#	db/schema.rb

[ci skip]

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

Closes gitlab-runner#3320

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

Show user contributions in correct timezone within user profile

Closes #38495

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

Adds QA_COOKIES option to gitlab-qa

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

Rack with Unicorn is unable to handle chunked requests due to private `eof?` method.
This exposes `eof?` not changing `rack` behavior.

Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/8539

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

Resolve "Instance level Maven endpoint"

Closes #7769

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

Geo: Synchronize repository and registry removal

Closes #7960

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

Return real deployment status to frontend

Closes #53578

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