Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-01 00:08:27 +01:00
Code Issues Projects Releases Wiki Activity
e7ae1ff714
unleash.unleash/frontend/src/component/changeRequest
History
Thomas Heartman e7ae1ff714
Feat(#4209): add conflict marker to segment changes (#4447) 
In doing so, we extract the shared conflict marker component from the
feature change and reuse it for both feature and segment changes.

Here's what it looks like:

![image](https://github.com/Unleash/unleash/assets/17786332/4a67aa7a-1953-488f-8bcb-6aac006d53e9)


Update: also straightened out the borders of the conflict warning:


![image](https://github.com/Unleash/unleash/assets/17786332/153799f3-cff2-4aa0-8fb0-8e31d1052b9f)
2023-08-08 12:36:45 +00:00
..
ChangeRequest Feat(#4209): add conflict marker to segment changes (#4447) 2023-08-08 12:36:45 +00:00
ChangeRequestConfirmDialog
ChangeRequestOverview
ChangeRequestSidebar
ChangeRequestStatusBadge
ProjectChangeRequests
ChangeRequest.test.tsx
changeRequest.types.ts Feat(#4209): add conflict marker to segment changes (#4447) 2023-08-08 12:36:45 +00:00
ChangeRequestPermissions.test.tsx
changesCount.ts