Fix remaining “merge blocked” states in MR merge widget
Follow-up from !71721 (comment 702513034)
There are some “merge blocked” states that we haven't covered yet.
State | Screenshot | Notes |
---|---|---|
Checking | Misaligned and “error” message should be using the default text color. | |
SHA mismatch | Same as above | |
Rebase |
Rebase button should be after text. See design specs
|
|
Conflicts |
Merge button should not be visible and “error” message should be using the default text color. See design specs
|
|
Pipeline must succeed | Same as above | |
Pipeline blocked | Same as above | |
Draft | Same as above | |
Unresolved threads | Same as above | |
Missing approvals | ||
Project archived | ||
Has denied licenses | ||
Source or target branch is missing | ||
Using a secondary Geo node | ||
Blocked by another MR |
Edited by Pedro Moreira da Silva