(Part 5) FE multiple approval rules - pipeline clean up
What does this MR do?
This MR fixes some issues with the feature branch https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001.
- Removes
ee/api.js
file that was added to the feature branch. - Renames references of the feature flag
approval_rule
toapproval_rules
(BE already updated this). - Adds some
sync: false
to failing specs that usevue-test-utils
.
PLEASE NOTE:
- This does not point to
master
. - This will not fix the
karma
job on it's own. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9433 needs to be merged withmaster
to do that.
What are the relevant issue numbers?
- Part of #1979 (closed)
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
Merge request reports
Activity
changed milestone to %11.8
added Create [DEPRECATED] Deliverable GitLab Premium approvals backend customer customer+ devopscreate direction frontend merge requests missed-deliverable missed:11.7 priority1 ~2975006 workflowin review + 1 deleted label
removed workflowin review label
removed backend label
mentioned in merge request !9001 (merged)
2 Warnings Most of the time, merge requests should target master
. Otherwise, please set the relevantPick into X.Y
label.CHANGELOG missing. You can create one with:
bin/changelog -m 9432 "(Part 5) FE multiple approval rules - pipeline clean up"
If your merge request doesn’t warrant a CHANGELOG entry,
consider adding any of the ~backstage, ci-build, ~Documentation, meta, QA, test labels.
See the documentation.Generated by
DangerEdited by 🤖 GitLab Bot 🤖assigned to @pslaughter
added 18 commits
-
f7032d65...a97cdf16 - 13 commits from branch
1979-fe-multiple-approval-rules
- 30ee49ee - Add `sync: false` to project_rules_spec
- a4743898 - Rewrite project_header_spec with vue-test-utils
- 168daae7 - Add `sync: false` to rule_controls_spec
- 9af30dec - Remove getChildInstances call project_search_spec
- 5bf3a57f - Stub approval_rules feature flag in specs
Toggle commit list-
f7032d65...a97cdf16 - 13 commits from branch
- Resolved by Phil Hughes
- Resolved by Phil Hughes
- Resolved by Phil Hughes
@iamphill, could review / merge this small cleanup MR that points to the
1979-fe-multiple-approval-rules
feature branch. You can see the scope of this MR in the description. Thank you!Edited by Paul Slaughterassigned to @iamphill
mentioned in merge request !9435 (merged)
assigned to @pslaughter
added 107 commits
-
1668866b...6d02d576 - 102 commits from branch
1979-fe-multiple-approval-rules
- 8e7b31e7 - Add `sync: false` to project_rules_spec
- e021334e - Add `sync: false` to rule_controls_spec
- a4fd334c - Stub approval_rules feature flag in specs
- 898bb407 - Rename feature approval_rule to approval_rules
- 3ef43053 - Replace ee/api.js with paths in HAML
Toggle commit list-
1668866b...6d02d576 - 102 commits from branch
added 107 commits
-
1668866b...6d02d576 - 102 commits from branch
1979-fe-multiple-approval-rules
- 8e7b31e7 - Add `sync: false` to project_rules_spec
- e021334e - Add `sync: false` to rule_controls_spec
- a4fd334c - Stub approval_rules feature flag in specs
- 898bb407 - Rename feature approval_rule to approval_rules
- 3ef43053 - Replace ee/api.js with paths in HAML
Toggle commit list-
1668866b...6d02d576 - 102 commits from branch
added 70 commits
-
3ef43053...b57bd838 - 65 commits from branch
1979-fe-multiple-approval-rules
- 901c4129 - Add `sync: false` to project_rules_spec
- d22c6a3c - Add `sync: false` to rule_controls_spec
- 8cf5a25e - Stub approval_rules feature flag in specs
- f5b939f7 - Rename feature approval_rule to approval_rules
- 6e66baed - Replace ee/api.js with paths in HAML
Toggle commit list-
3ef43053...b57bd838 - 65 commits from branch
@iamphill, could you merge please?
assigned to @iamphill
mentioned in commit 61d5edfd
added Enterprise Edition label