summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-11-17 16:17:22 +0000
committerFilipa Lacerda <filipa@gitlab.com>2016-11-17 16:17:22 +0000
commit6d96614343e7039afc9efa2882d0e0882d717ceb (patch)
treed5db03562e4834a71f7672c26726c8ccb8db84d4
parenteb53bb70ef8c1c3a5fefa1a120d2223c365c6ccf (diff)
downloadgitlab-ce-6d96614343e7039afc9efa2882d0e0882d717ceb.tar.gz
Changes url to path
-rw-r--r--app/assets/javascripts/environments/components/environment_actions.js.es62
-rw-r--r--app/assets/javascripts/environments/components/environment_item.js.es618
2 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.js.es6 b/app/assets/javascripts/environments/components/environment_actions.js.es6
index 4cdcd555e89..ca1a5861f30 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js.es6
+++ b/app/assets/javascripts/environments/components/environment_actions.js.es6
@@ -51,7 +51,7 @@
<ul class="dropdown-menu dropdown-menu-align-right">
<li v-for="action in actions">
- <a :href="action.play_url" data-method="post" rel="nofollow" class="js-manual-action-link">
+ <a :href="action.play_path" data-method="post" rel="nofollow" class="js-manual-action-link">
<span class="action-play-icon-container">
<!-- svg goes here -->
</span>
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 20720d69df0..0e29350d7e4 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -168,7 +168,7 @@
return this.model.last_deployment.manual_actions.map((action) => {
const parsedAction = {
name: gl.text.humanize(action.name),
- play_url: action.play_url,
+ play_path: action.play_path,
};
return parsedAction;
});
@@ -224,8 +224,8 @@
commitUrl() {
if (this.model.last_deployment &&
this.model.last_deployment.commit &&
- this.model.last_deployment.commit.commit_url) {
- return this.model.last_deployment.commit.commit_url;
+ this.model.last_deployment.commit.commit_path) {
+ return this.model.last_deployment.commit.commit_path;
}
return undefined;
},
@@ -274,15 +274,15 @@
},
/**
- * Verifies if the `retry_url` key is present and returns its value.
+ * Verifies if the `retry_path` key is present and returns its value.
*
* @returns {String|Undefined}
*/
retryUrl() {
if (this.model.last_deployment &&
this.model.last_deployment.deployable &&
- this.model.last_deployment.deployable.retry_url) {
- return this.model.last_deployment.deployable.retry_url;
+ this.model.last_deployment.deployable.retry_path) {
+ return this.model.last_deployment.deployable.retry_path;
}
return undefined;
},
@@ -355,7 +355,7 @@
<a
v-if="!isFolder"
class="environment-name"
- :href="model.environment_url"
+ :href="model.environment_path"
v-html="model.name">
</a>
<span v-else v-on:click="toggleRow(model)" class="folder-name">
@@ -390,7 +390,7 @@
<td>
<a v-if="!isFolder && model.last_deployment && model.last_deployment.deployable"
class="build-link"
- :href="model.last_deployment.deployable.build_url"
+ :href="model.last_deployment.deployable.build_path"
v-html="buildName">
</a>
</td>
@@ -435,7 +435,7 @@
<div v-if="isStoppable && canCreateDeployment" class="inline js-stop-component-container">
<stop-component
- :stop_url="model.environment_url">
+ :stop_url="model.environment_path">
</stop-component>
</div>