delta/gitlab/gitlab-ce.git, branch master-security-update gitlab.com: gitlab-org/gitlab-ce.git Merge remote-tracking branch 'origin/upstream-9-2-security' into master-security-update 2017-06-08T18:29:36+00:00 DJ Mountney david@twkie.net 2017-06-08T18:29:36+00:00 e0e5d097327c52e54a6e7433bbf0e350f15bf1f3 






Merge branch 'upstream-9-2-security' into master-security-update
2017-06-08T17:08:06+00:00

DJ Mountney
david@twkie.net

2017-06-08T17:08:06+00:00

2afd2fbcb83baaeee8c66859c08b4acff812dccf












Merge branch '25934-project-snippet-vis' into 'security-9-2'
2017-06-08T16:56:39+00:00

DJ Mountney
david@twkie.net

2017-06-08T16:56:39+00:00

ae6adf165ce7d9a85d7b8886eefdbe96aac2816b

Fix visibility when referencing snippets

See merge request !2101





Fix visibility when referencing snippets

See merge request !2101







Merge branch 'dz-api-x-frame' into 'security-9-2'
2017-06-08T16:54:24+00:00

DJ Mountney
david@twkie.net

2017-06-08T16:54:24+00:00

e1d1a5240c98a427f2ef10f2a7cbee0c9a883834

Restrict API X-Frame-Options to same origin

See merge request !2103





Restrict API X-Frame-Options to same origin

See merge request !2103







Merge branch 'dz-restrict-autocomplete' into 'security-9-1'
2017-06-08T16:52:27+00:00

DJ Mountney
david@twkie.net

2017-06-08T16:52:27+00:00

982368dc55bbd22f82bf908f8af220056202a65a

Allow users autocomplete by author_id only for authenticated users

See merge request !2100





Allow users autocomplete by author_id only for authenticated users

See merge request !2100







Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'
2017-06-08T16:48:10+00:00

DJ Mountney
david@twkie.net

2017-06-08T16:48:10+00:00

7113b1a45bd29318c3ec5ea5f61b1d523868ef4d

Escapes html content before appending it to the DOM

See merge request !2107





Escapes html content before appending it to the DOM

See merge request !2107







Merge branch 'dm-diff-file-diffable' into 'master'
2017-06-08T16:14:56+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-06-08T16:14:56+00:00

e9002222a0fc65e4e3328c7c536e43516986eb40

Move diffable? method from Repository to Diff::File

See merge request !11980




Move diffable? method from Repository to Diff::File

See merge request !11980






Merge branch 'dm-highlight-diff-file-blob' into 'master'
2017-06-08T15:50:30+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-06-08T15:50:30+00:00

9ea883fb5d02608010db858237cbd4926ae99650

Use Diff::File blob methods from diff highlighter

See merge request !11978




Use Diff::File blob methods from diff highlighter

See merge request !11978






Merge branch 'docs/shared-runners' into 'master'
2017-06-08T15:08:42+00:00

Sean Packham
sean@seanpackham.com

2017-06-08T15:08:42+00:00

b4972c4b237ad270ad1a4054c2fe2439d60ee06d

Refactor Runners docs

Closes #18882

See merge request !11948




Refactor Runners docs

Closes #18882

See merge request !11948






Merge branch 'docs/rm-protected-branches' into 'master'
2017-06-08T15:06:45+00:00

Sean Packham
sean@seanpackham.com

2017-06-08T15:06:45+00:00

378830c525664f7cb1f0f1a7f745b071426cf6ff

Add docs for protected branches deletion feature

Closes #32218

See merge request !11536




Add docs for protected branches deletion feature

Closes #32218

See merge request !11536