commit 10456b1e9240886432f565dd17689080bbb133b9
Merge: 312c1a9bdf8 a5f46278
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Nov 29 14:33:21 2018 +0900

    Merge branch 'master-ce' into add-counter-for-trace-chunks

commit 312c1a9bdf8efc45c3fed5ff50f05cc589bbb4ed
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Nov 28 20:06:18 2018 +0900

    Fix coding offence

commit e397cc2ccc1b2cf7f8b3558b8fa81fe2aa0ab366
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Nov 28 14:40:24 2018 +0900

    Fix tracking archive failure

Update documentation with note regarding restoring ssh host keys

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

Bump gitlab-shell to 8.4.3

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

Update Knative IP address docs

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

[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

See https://gitlab.com/gitlab-org/gitlab-shell/blob/master/CHANGELOG

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

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

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

Return real deployment status to frontend

Closes #53578

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

Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge Requests from other projects"

Closes #50839

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

Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge Requests from other projects"

Adds margin between tags when job is stuck

Closes #54571

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