summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis <boudinot.regis@yahoo.com>2016-12-21 18:06:23 -0700
committerRegis <boudinot.regis@yahoo.com>2016-12-21 18:06:23 -0700
commit2d1218991c1cd5b7b56e15ccc8d7c47d4b8e6cd0 (patch)
tree853b3003e375051423e183f079d2039a51f57909
parent6a7af99a42a13d87cd4c8c2ea757464d2b0f9ce4 (diff)
downloadgitlab-ce-2d1218991c1cd5b7b56e15ccc8d7c47d4b8e6cd0.tar.gz
use path instead of url for commit ref and pipeline url
-rw-r--r--app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es62
-rw-r--r--app/assets/javascripts/vue_pipelines_index/pipelines.js.es64
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es6
index 96baef32a9f..92c343e33da 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es6
@@ -13,7 +13,7 @@
},
template: `
<td>
- <a :href='pipeline.url'>
+ <a :href='pipeline.path'>
<span class="pipeline-id">#{{pipeline.id}}</span>
</a>
<span>by</span>
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index b82d8f1a0db..a16c1e5bef9 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -52,7 +52,7 @@
},
ref(pipeline) {
const { ref } = pipeline;
- return ({ name: ref.name, tag: ref['tag?'], ref_url: ref.url });
+ return ({ name: ref.name, tag: ref.tag, ref_url: ref.path });
},
commitTitle(pipeline) {
return pipeline.commit ? pipeline.commit.title : '';
@@ -61,7 +61,7 @@
return pipeline.commit ? pipeline.commit.short_id : '';
},
commitUrl(pipeline) {
- return pipeline.commit ? pipeline.commit.commit_url : '';
+ return pipeline.commit ? pipeline.commit.commit_path : '';
},
match(string) {
return string.replace(/_([a-z])/g, (m, w) => w.toUpperCase());