Fixes conflicts for app/assets/javascripts/jobs/components/stages_dropdown.vue

1 files changed, 5 insertions, 39 deletions

diff --git a/app/assets/javascripts/jobs/components/stages_dropdown.vue b/app/assets/javascripts/jobs/components/stages_dropdown.vue
index a29bd6ec780..4b0900a75cc 100644
--- a/app/assets/javascripts/jobs/components/stages_dropdown.vue
+++ b/app/assets/javascripts/jobs/components/stages_dropdown.vue
@@ -1,14 +1,7 @@
 <script>
-<<<<<<< HEAD
   import _ from 'underscore';
   import CiIcon from '~/vue_shared/components/ci_icon.vue';
   import Icon from '~/vue_shared/components/icon.vue';
-  import { __ } from '~/locale';
-=======
-import _ from 'underscore';
-import CiIcon from '~/vue_shared/components/ci_icon.vue';
-import Icon from '~/vue_shared/components/icon.vue';
->>>>>>> 7e342757e28... Merge branch '52618-incorrect-stage-being-shown-in-side-bar-of-job-view-api' into 'master'
 
   export default {
     components: {
@@ -24,47 +17,20 @@ import Icon from '~/vue_shared/components/icon.vue';
         type: Array,
         required: true,
       },
+      selectedStage: {
+        type: String,
+        required: true,
+      },
     },
-<<<<<<< HEAD
-    data() {
-      return {
-        selectedStage: this.stages.length > 0 ? this.stages[0].name : __('More'),
-      };
-    },
+
     computed: {
       hasRef() {
         return !_.isEmpty(this.pipeline.ref);
       },
     },
-    watch: {
-      // When the component is initially mounted it may start with an empty stages array.
-      // Once the prop is updated, we set the first stage as the selected one
-      stages(newVal) {
-        if (newVal.length) {
-          this.selectedStage = newVal[0].name;
-        }
-      },
-=======
-    selectedStage: {
-      type: String,
-      required: true,
-    },
-  },
-
-  computed: {
-    hasRef() {
-      return !_.isEmpty(this.pipeline.ref);
-    },
-  },
-  methods: {
-    onStageClick(stage) {
-      this.$emit('requestSidebarStageDropdown', stage);
->>>>>>> 7e342757e28... Merge branch '52618-incorrect-stage-being-shown-in-side-bar-of-job-view-api' into 'master'
-    },
     methods: {
       onStageClick(stage) {
         this.$emit('requestSidebarStageDropdown', stage);
-        this.selectedStage = stage.name;
       },
     },
   };