summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis <boudinot.regis@yahoo.com>2017-01-02 16:20:10 -0700
committerRegis <boudinot.regis@yahoo.com>2017-01-02 16:20:10 -0700
commit588219352c99213d099aff72f32d6ad9ec4830d4 (patch)
treeaf12e6881752731357bd0f9c8a129cf3d04b1ead
parent87427496b05944576637c1a70c5bfa3b6bfb4522 (diff)
downloadgitlab-ce-588219352c99213d099aff72f32d6ad9ec4830d4.tar.gz
do not make a url if no deatils_path is present - use '.tag' for ref in commit component
-rw-r--r--app/assets/javascripts/vue_pipelines_index/pipelines.js.es62
-rw-r--r--app/assets/javascripts/vue_pipelines_index/status.js.es62
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index a16c1e5bef9..65e6aff426b 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -88,7 +88,7 @@
<commit
:commit-icon-svg='svgs.commitIconSvg'
:author='author(pipeline)'
- :tag="pipeline.ref['tag?']"
+ :tag="pipeline.ref.tag"
:title='commitTitle(pipeline)'
:commit-ref='ref(pipeline)'
:short-sha='commitSha(pipeline)'
diff --git a/app/assets/javascripts/vue_pipelines_index/status.js.es6 b/app/assets/javascripts/vue_pipelines_index/status.js.es6
index 88fead9c651..592963feb4d 100644
--- a/app/assets/javascripts/vue_pipelines_index/status.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/status.js.es6
@@ -18,7 +18,7 @@
},
detailsPath() {
const { status } = this.pipeline.details;
- return status.details_path ? status.details_path : '#';
+ return status.details_path ? status.details_path : false;
},
},
template: `