diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/src/containers/build/Misc.jsx | 2 | ||||
-rw-r--r-- | web/src/containers/charts/Misc.jsx | 4 | ||||
-rw-r--r-- | web/src/pages/Builds.jsx | 2 | ||||
-rw-r--r-- | web/src/pages/Buildsets.jsx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/web/src/containers/build/Misc.jsx b/web/src/containers/build/Misc.jsx index 53270d83b..f52fbcd96 100644 --- a/web/src/containers/build/Misc.jsx +++ b/web/src/containers/build/Misc.jsx @@ -58,7 +58,7 @@ const RESULT_ICON_CONFIGS = { color: 'var(--pf-global--info-color--100)', badgeColor: 'yellow', }, - MERGER_FAILURE: { + MERGE_CONFLICT: { icon: ExclamationIcon, color: 'var(--pf-global--warning-color--100)', badgeColor: 'orange', diff --git a/web/src/containers/charts/Misc.jsx b/web/src/containers/charts/Misc.jsx index 9ee90e5e6..d55c459b5 100644 --- a/web/src/containers/charts/Misc.jsx +++ b/web/src/containers/charts/Misc.jsx @@ -41,7 +41,7 @@ const buildResultLegendData = [ symbol: { fill: '#F6D173' }, }, { - name: 'MERGER_FAILURE', + name: 'MERGE_CONFLICT', // PF orange-200 symbol: { fill: '#EF9234' }, }, @@ -81,4 +81,4 @@ const buildsBarStyle = { } } -export { buildResultLegendData, buildsBarStyleMap, buildsBarStyle }
\ No newline at end of file +export { buildResultLegendData, buildsBarStyleMap, buildsBarStyle } diff --git a/web/src/pages/Builds.jsx b/web/src/pages/Builds.jsx index 3517e14a7..0e76a73be 100644 --- a/web/src/pages/Builds.jsx +++ b/web/src/pages/Builds.jsx @@ -82,7 +82,7 @@ class BuildsPage extends React.Component { 'POST_FAILURE', 'SKIPPED', 'NODE_FAILURE', - 'MERGER_FAILURE', + 'MERGE_CONFLICT', 'CONFIG_ERROR', 'TIMED_OUT', 'CANCELED', diff --git a/web/src/pages/Buildsets.jsx b/web/src/pages/Buildsets.jsx index f0d0e5277..382df5eb2 100644 --- a/web/src/pages/Buildsets.jsx +++ b/web/src/pages/Buildsets.jsx @@ -70,7 +70,7 @@ class BuildsetsPage extends React.Component { options: [ 'SUCCESS', 'FAILURE', - 'MERGER_FAILURE', + 'MERGE_CONFLICT', 'DEQUEUED', ] }, |