Merge dev.gitlab.org master into GitLab.com master
What does this MR do?
This is another merge of dev.gitlab.org master into GitLab.com master, after an additional security MR was merged into master.
Conflicts
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9836 appears to have been rebased, resulting in these conflicts appearing again. It also appears that not all dev commits made it into the MR. Please resolve these conflicts again without rebasing.
-
app/models/concerns/issuable.rb
: @jarka -
app/models/concerns/milestoneish.rb
: @jarka -
app/policies/group_policy.rb
: @felipe_artur -
ee/spec/models/burndown_spec.rb
: @jarka -
spec/policies/group_policy_spec.rb
: @mksionek
Edited by Jarka Košanová