Merge dev.gitlab.org master into GitLab.com master
What does this MR do?
This merges the security changes from dev to GitLab.com
Conflicts
There are three files with conflicts, which need to be resolved by the respective authors:
-
app/policies/group_policy.rb: @felipe_artur -
spec/mailers/notify_spec.rb: @jarka -
spec/policies/group_policy_spec.rb: @mksionek
Please resolve these conflicts by pushing to this merge request, then check off the checkbox.
Edited by Stan Hu