Fix EE master failure: static-analysis: Duplicate key
What does this MR do?
Fixes EE master failure: https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/168131803
This failure is caused by the automatic ce-to-ee merge duplicating a change that was already merged via an EE port 9 minutes earlier.
Automatic ce-to-ee merge commit: https://gitlab.com/gitlab-org/gitlab-ee/commit/43911996331786940a0bcafffe606de800b6a656#934f4855b7071efe313325c81f0db89299073fc1
What are the relevant issue numbers?
Resolves https://gitlab.com/gitlab-org/gitlab-ee/issues/10040
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated via this MR -
Documentation reviewed by technical writer or follow-up review issue created -
Tests added for this feature/bug -
Tested in all supported browsers -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides -
Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process. -
EE specific content should be in the top level /ee
folder -
For a paid feature, have we considered GitLab.com plans, how it works for groups, and is there a design for promoting it to users who aren't on the correct plan? -
Security reports checked/validated by reviewer
Edited by Michael Kozono