Merge "Rename MERGER_FAILURE to MERGE_CONFLICT"

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',

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 }
+export { buildResultLegendData, buildsBarStyleMap, buildsBarStyle }

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',

web/src/pages/Buildsets.jsx

@@ -70,7 +70,7 @@ class BuildsetsPage extends React.Component {
         options: [
           'SUCCESS',
           'FAILURE',
-          'MERGER_FAILURE',
+          'MERGE_CONFLICT',
           'DEQUEUED',
         ]
       },