Backport 10.1.2 security fixes to master
What does this MR do?
Backports 10.1.2 security fixes to master.
Are there points in the code the reviewer needs to double check?
- I actually cherry-picked from
10-1-stable-ee
, notsecurity-10-1-ee
, which seemed to be outdated. - Should
VERSION
stay at10.2.0-pre
? - There are no new unreleased changelog entries from the commits I picked. I'm not sure what should be done regarding the changelogs.
Why was this MR needed?
This step of the Security Release: https://gitlab.com/gitlab-org/gitlab-ce/issues/39733
[ ] Publish latest code to GitLab.com (owner: Release Manager)
Which I took to be equivalent to this step of the sub release issues:
[ ] Cherry-pick the merges from the
security
branch intomaster
and push to all remotes.
What are the relevant issue numbers?
- Security Release issue - https://gitlab.com/gitlab-org/gitlab-ce/issues/39733
-
10.1.2
- https://gitlab.com/gitlab-org/gitlab-ce/issues/39890 -
10.0.6
- https://gitlab.com/gitlab-org/gitlab-ce/issues/39891 -
9.5.10
- https://gitlab.com/gitlab-org/gitlab-ce/issues/39892
Crosslinking my chatter in Slack about this: https://gitlab.slack.com/archives/C0XM5UU6B/p1510210765000065?thread_ts=1510201211.000151&cid=C0XM5UU6B
Edited by 🤖 GitLab Bot 🤖