Skip to content
Snippets Groups Projects

Add "reviewed but not approved" state in merge request sidebar

Merged Annabel Dunstone Gray requested to merge re-approve-icon into master
All threads resolved!

What does this MR do and why?

  • Aligns all checkmarks and re-review buttons
  • Adds explicit state "This has been reviewed but not approved yet"
  • Removes success checkmark (appears when you click re-request review)

Screenshots or screen recordings

Before After
Screenshot_2023-04-05_at_1.26.26_PM Screenshot_2023-04-05_at_1.24.09_PM
Screenshot_2023-04-05_at_1.24.28_PM

How to set up and validate locally

Find an MR, or impersonate users to get to the following approval states:

  • Approve
  • Approve with review (submit an actual review and approve)
  • Review without approval
  • Assigned reviewer without approval or review

#394879 (closed)

Edited by Annabel Dunstone Gray

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
  • Annabel Dunstone Gray changed the description

    changed the description

  • added 1 commit

    • 3bcb3f70 - Add reviewed but not approved state in MR sidebar

    Compare with previous version

  • Contributor

    Allure report

    allure-report-publisher generated test report!

    e2e-review-qa: :white_check_mark: test report for f08873ea

    expand test summary
    +-----------------------------------------------------------------------+
    |                            suites summary                             |
    +------------------+--------+--------+---------+-------+-------+--------+
    |                  | passed | failed | skipped | flaky | total | result |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Monitor          | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Govern           | 26     | 0      | 0       | 0     | 26    | ✅     |
    | Manage           | 8      | 0      | 3       | 0     | 11    | ✅     |
    | Create           | 28     | 0      | 1       | 0     | 29    | ✅     |
    | Data Stores      | 22     | 0      | 0       | 0     | 22    | ✅     |
    | Plan             | 49     | 0      | 1       | 0     | 50    | ✅     |
    | Framework sanity | 9      | 0      | 1       | 0     | 10    | ✅     |
    | Verify           | 10     | 0      | 0       | 0     | 10    | ✅     |
    | Package          | 0      | 0      | 1       | 0     | 1     | ➖     |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Total            | 156    | 0      | 7       | 0     | 163   | ✅     |
    +------------------+--------+--------+---------+-------+-------+--------+
  • added 1 commit

    • 4bbe2495 - Add reviewed but not approved state in MR sidebar

    Compare with previous version

  • @seggenberger Can you please review UX :smile:

    @thomasrandolph As you're familiar with this area, could you please take a look at the specs I've likely made a mess of?

  • requested review from @seggenberger and @thomasrandolph

  • Sascha Eggenberger removed review request for @seggenberger

    removed review request for @seggenberger

  • Amy Qualls requested review from @aqualls

    requested review from @aqualls

  • added UI text label

  • added 262 commits

    Compare with previous version

  • requested review from @seggenberger

  • mentioned in issue #387070 (closed)

  • Amy Qualls approved this merge request

    approved this merge request

  • :wave: @aqualls, thanks for approving this merge request.

    This is the first time the merge request is approved. To ensure full test coverage, a new pipeline will be started shortly.

    For more info, please refer to the following links:

  • Amy Qualls removed review request for @aqualls

    removed review request for @aqualls

  • requested review from @aqualls

  • Annabel Dunstone Gray removed review request for @aqualls

    removed review request for @aqualls

  • added 106 commits

    Compare with previous version

  • removed review request for @thomasrandolph

  • requested review from @peterhegman

  • Annabel Dunstone Gray changed the description

    changed the description

  • Peter Hegman removed review request for @peterhegman

    removed review request for @peterhegman

  • added 1 commit

    • f08873ea - Add reviewed but not approved state in MR sidebar

    Compare with previous version

  • requested review from @peterhegman

  • Thomas Randolph approved this merge request

    approved this merge request

  • Peter Hegman approved this merge request

    approved this merge request

  • Peter Hegman removed review request for @peterhegman

    removed review request for @peterhegman

  • Sascha Eggenberger approved this merge request

    approved this merge request

  • Sascha Eggenberger removed review request for @seggenberger

    removed review request for @seggenberger

  • requested review from @peterhegman

  • Peter Hegman resolved all threads

    resolved all threads

  • Peter Hegman enabled an automatic merge when the pipeline for b80ed5ec succeeds

    enabled an automatic merge when the pipeline for b80ed5ec succeeds

  • merged

  • Peter Hegman mentioned in commit 3ba92be4

    mentioned in commit 3ba92be4

  • added workflowstaging label and removed workflowcanary label

  • mentioned in merge request !117228 (closed)

  • Please register or sign in to reply
    Loading