delta/gitlab/gitlab-ce.git, branch jk-update-templates gitlab.com: gitlab-org/gitlab-ce.git Update license templates for 10.0 2017-09-08T09:28:40+00:00 Jarka Kadlecova jarka@gitlab.com 2017-09-08T09:28:40+00:00 5e977a4221b4da694120109c36d2b9e1d8e64187 






Merge branch 'rs-pick-security-into-master' into 'master'
2017-09-08T06:45:20+00:00

Douwe Maan
douwe@gitlab.com

2017-09-08T06:45:20+00:00

bce1c50928e4885d54dd11221a9c8197a7fb1a7d

Update master with 9.5.4 security patches

See merge request !14131




Update master with 9.5.4 security patches

See merge request !14131






Merge branch '37550-improve-clarity-of-helm-chart-docs' into 'master'
2017-09-08T04:50:31+00:00

Achilleas Pipinellis
axil@gitlab.com

2017-09-08T04:50:31+00:00

dc46863cda29f19a5f403ebaaded92ba17faee2f

Improve clarity of Helm Chart docs

Closes #37550

See merge request !14100




Improve clarity of Helm Chart docs

Closes #37550

See merge request !14100






Improve clarity of Helm Chart docs
2017-09-08T04:50:30+00:00

Joshua Lambert
joshua@gitlab.com

2017-09-08T04:50:30+00:00

a3c6544511a8b87b30cb2a19339197e18bb9cb35












Remove changelogs we've already released in the security patches
2017-09-08T00:24:41+00:00

Robert Speicher
rspeicher@gmail.com

2017-09-08T00:23:04+00:00

13843483e886298efcf468eed14872079c53a9bf












Merge branch 'update-pages-9-5' into 'security-9-5'
2017-09-08T00:24:41+00:00

Douwe Maan
douwe@gitlab.com

2017-08-24T15:26:47+00:00

4e406a3223214aaa9a8b31186891676b6dc4acea

Update GitLab Pages (9.5)

See merge request !2159




Update GitLab Pages (9.5)

See merge request !2159






Merge branch 'fix-user-select-dropdown-escaping' into 'security-9-5'
2017-09-08T00:22:16+00:00

Clement Ho
clement@gitlab.com

2017-08-28T18:41:12+00:00

ba37848d584056069ae83955e53ce51a3ba1a0fe

Fixes the User Selection Display (9.5)

See merge request gitlab/gitlabhq!2177





Fixes the User Selection Display (9.5)

See merge request gitlab/gitlabhq!2177







Merge branch 'rs-issue-36104' into 'security-9-5'
2017-09-08T00:22:16+00:00

Douwe Maan
douwe@gitlab.com

2017-08-30T17:34:34+00:00

9b09856e7b853146ac4ff03d388f7063e6f0efbd

[9.5] Disallow the `name` attribute on all user-provided markup

See merge request gitlab/gitlabhq!2166




[9.5] Disallow the `name` attribute on all user-provided markup

See merge request gitlab/gitlabhq!2166






Merge branch 'rs-issue-36098' into 'security-9-5'
2017-09-08T00:22:16+00:00

Robert Speicher
robert@gitlab.com

2017-08-31T15:27:34+00:00

8629d5822a1a7af5708ebb785982b25e0d2400bf

[9.5] Limit `style` attribute on `th` and `td` elements to specific properties

See merge request gitlab/gitlabhq!2155




[9.5] Limit `style` attribute on `th` and `td` elements to specific properties

See merge request gitlab/gitlabhq!2155






Merge branch '29943-environment-folder' into 'security-9-5'
2017-09-08T00:22:16+00:00

Kamil Trzciński
kamil@gitlab.com

2017-08-21T15:46:45+00:00

4efd18d7e140bf2b6b95637af630e7294fcf28cc

Do not use `location.pathname` when accessing environments folders

See merge request !2147




Do not use `location.pathname` when accessing environments folders

See merge request !2147