Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue
index cc52ff57c13..d6adaf78da4 100644
--- a/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue
+++ b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue
@@ -72,7 +72,8 @@ export default {
             method: this.cancelPipeline,
             ariaLabel: __('Cancel downstream pipeline'),
           };
-        } else if (this.isRetryable) {
+        }
+        if (this.isRetryable) {
           return {
             icon: 'retry',
             method: this.retryPipeline,
@@ -141,7 +142,8 @@ export default {
     label() {
       if (this.parentPipeline) {
         return __('Parent');
-      } else if (this.childPipeline) {
+      }
+      if (this.childPipeline) {
         return __('Child');
       }
       return __('Multi-project');