Port 15080 to EE
What does this MR do?
This is a port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15080.
Are there points in the code the reviewer needs to double check?
Why was this MR needed?
There are 2 more actions in EE. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15080#note_47588573
Screenshots (if relevant)
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated -
API support added -
Tests added for this feature/bug - Review
-
Has been reviewed by UX -
Has been reviewed by Frontend -
Has been reviewed by Backend -
Has been reviewed by Database
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Squashed related commits together -
Internationalization required/considered -
If paid feature, have we considered GitLab.com plan and how it works for groups and is there a design for promoting it to users who aren't on the correct plan
What are the relevant issue numbers?
Merge request reports
Activity
added Plan [DEPRECATED] api labels labels
changed milestone to %10.1
assigned to @smcgivern
@smcgivern this is the port to EE. The initial security fix was backported, should I also create backports of this for the stable branches?
added 286 commits
-
e62785be...3a7bf856 - 285 commits from branch
master
- 6cacd1b2 - fix the label system notes from being redacted in the API
-
e62785be...3a7bf856 - 285 commits from branch
@mbergeron could you apply https://gitlab.com/gitlab-org/gitlab-ce/commit/c900c21eef9235306d7d0da42b07aa2de346e263 here too please?
changed milestone to %10.2
assigned to @mbergeron
@smcgivern done
assigned to @smcgivern
enabled an automatic merge when the pipeline for b81ad331 succeeds
mentioned in commit 5207d613
mentioned in commit fbe9d094
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3530, will merge into
10-2-stable-ee
ready for10.2.2-ee
added devopsplan label
added Enterprise Edition label
removed Plan [DEPRECATED] label