Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 13 deletions

diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
index 6ab4eb58977..42988e96692 100644
--- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
@@ -1,5 +1,5 @@
 <script>
-import { capitalize, escape, isEmpty } from 'lodash';
+import { escape, isEmpty } from 'lodash';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { reportToSentry } from '../../utils';
 import MainGraphWrapper from '../graph_shared/main_graph_wrapper.vue';
@@ -92,9 +92,6 @@ export default {
     columnSpacingClass() {
       return this.isStageView ? 'gl-px-6' : 'gl-px-9';
     },
-    formattedTitle() {
-      return capitalize(escape(this.name));
-    },
     hasAction() {
       return !isEmpty(this.action);
     },
@@ -141,8 +138,8 @@ export default {
         class="gl-display-flex gl-justify-content-space-between gl-relative"
         :class="$options.titleClasses"
       >
-        <span :title="formattedTitle" class="gl-text-truncate gl-pr-3 gl-w-85p">
-          {{ formattedTitle }}
+        <span :title="name" class="gl-text-truncate gl-pr-3 gl-w-85p">
+          {{ name }}
         </span>
         <action-component
           v-if="hasAction && canUpdatePipeline"
diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/stage_name.vue b/app/assets/javascripts/pipelines/components/pipeline_graph/stage_name.vue
index e693075e19a..600832b7633 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_graph/stage_name.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_graph/stage_name.vue
@@ -1,5 +1,4 @@
 <script>
-import { capitalize, escape } from 'lodash';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue';
 
 export default {
@@ -12,17 +11,12 @@ export default {
       required: true,
     },
   },
-  computed: {
-    formattedTitle() {
-      return capitalize(escape(this.stageName));
-    },
-  },
 };
 </script>
 <template>
   <tooltip-on-truncate :title="stageName" truncate-target="child" placement="top">
     <div class="gl-py-2 gl-text-truncate gl-font-weight-bold gl-w-20">
-      {{ formattedTitle }}
+      {{ stageName }}
     </div>
   </tooltip-on-truncate>
 </template>