Skip to content
Snippets Groups Projects

(Part 5) FE multiple approval rules - pipeline clean up

Merged Paul Slaughter requested to merge 1979-fe-part5-cleanup into 1979-fe-multiple-approval-rules
All threads resolved!

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 to approval_rules (BE already updated this).
  • Adds some sync: false to failing specs that use vue-test-utils.

PLEASE NOTE:

What are the relevant issue numbers?

Does this MR meet the acceptance criteria?

Edited by Paul Slaughter

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Paul Slaughter
  • Paul Slaughter changed the description

    changed the description

  • Paul Slaughter added 4 commits

    added 4 commits

    • a484a571 - Add `sync: false` to rule_controls_spec
    • 81d45626 - Stub approval_rules feature flag in specs
    • af33f446 - Rename feature approval_rule to approval_rules
    • 3aefd32b - Replace ee/api.js with paths in HAML

    Compare with previous version

  • Paul Slaughter
  • Author Maintainer

    @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! :bow:

    Edited by Paul Slaughter
  • Paul Slaughter changed the description

    changed the description

  • Paul Slaughter changed the description

    changed the description

  • Paul Slaughter mentioned in merge request !9435 (merged)

    mentioned in merge request !9435 (merged)

  • Paul Slaughter added 1 commit

    added 1 commit

    • 1668866b - Replace ee/api.js with paths in HAML

    Compare with previous version

  • Changes look good, but tests are failing :disappointed:

  • Paul Slaughter added 107 commits

    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

    Compare with previous version

  • Paul Slaughter added 107 commits

    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

    Compare with previous version

  • Paul Slaughter added 70 commits

    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

    Compare with previous version

  • Author Maintainer

    Changes look good, but tests are failing :disappointed:

    Yeah. This was actually an upstream issue caused by the BE branch. The BE branch was just fixed and merged (:tada:), so I've done a bit of rebasing which should make this pipeline green (except for ee-specific-lines).

  • Author Maintainer

    Pipeline is green except for an expected ee-specific-lines-check (I'll create a CE port for the feature branch later).

  • Author Maintainer

    @iamphill, could you merge please? :smile:

  • Phil Hughes resolved all discussions

    resolved all discussions

  • Phil Hughes approved this merge request

    approved this merge request

  • merged

  • Phil Hughes mentioned in commit 61d5edfd

    mentioned in commit 61d5edfd

  • Please register or sign in to reply
    Loading