Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6d966143
Commit
6d966143
authored
Nov 17, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes url to path
parent
eb53bb70
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
app/assets/javascripts/environments/components/environment_actions.js.es6
...cripts/environments/components/environment_actions.js.es6
+1
-1
app/assets/javascripts/environments/components/environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+9
-9
No files found.
app/assets/javascripts/environments/components/environment_actions.js.es6
View file @
6d966143
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
<ul class="dropdown-menu dropdown-menu-align-right">
<ul class="dropdown-menu dropdown-menu-align-right">
<li v-for="action in actions">
<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">
<span class="action-play-icon-container">
<!-- svg goes here -->
<!-- svg goes here -->
</span>
</span>
...
...
app/assets/javascripts/environments/components/environment_item.js.es6
View file @
6d966143
...
@@ -168,7 +168,7 @@
...
@@ -168,7 +168,7 @@
return this.model.last_deployment.manual_actions.map((action) => {
return this.model.last_deployment.manual_actions.map((action) => {
const parsedAction = {
const parsedAction = {
name: gl.text.humanize(action.name),
name: gl.text.humanize(action.name),
play_
url: action.play_url
,
play_
path: action.play_path
,
};
};
return parsedAction;
return parsedAction;
});
});
...
@@ -224,8 +224,8 @@
...
@@ -224,8 +224,8 @@
commitUrl() {
commitUrl() {
if (this.model.last_deployment &&
if (this.model.last_deployment &&
this.model.last_deployment.commit &&
this.model.last_deployment.commit &&
this.model.last_deployment.commit.commit_
url
) {
this.model.last_deployment.commit.commit_
path
) {
return this.model.last_deployment.commit.commit_
url
;
return this.model.last_deployment.commit.commit_
path
;
}
}
return undefined;
return undefined;
},
},
...
@@ -274,15 +274,15 @@
...
@@ -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}
* @returns {String|Undefined}
*/
*/
retryUrl() {
retryUrl() {
if (this.model.last_deployment &&
if (this.model.last_deployment &&
this.model.last_deployment.deployable &&
this.model.last_deployment.deployable &&
this.model.last_deployment.deployable.retry_
url
) {
this.model.last_deployment.deployable.retry_
path
) {
return this.model.last_deployment.deployable.retry_
url
;
return this.model.last_deployment.deployable.retry_
path
;
}
}
return undefined;
return undefined;
},
},
...
@@ -355,7 +355,7 @@
...
@@ -355,7 +355,7 @@
<a
<a
v-if="!isFolder"
v-if="!isFolder"
class="environment-name"
class="environment-name"
:href="model.environment_
url
"
:href="model.environment_
path
"
v-html="model.name">
v-html="model.name">
</a>
</a>
<span v-else v-on:click="toggleRow(model)" class="folder-name">
<span v-else v-on:click="toggleRow(model)" class="folder-name">
...
@@ -390,7 +390,7 @@
...
@@ -390,7 +390,7 @@
<td>
<td>
<a v-if="!isFolder && model.last_deployment && model.last_deployment.deployable"
<a v-if="!isFolder && model.last_deployment && model.last_deployment.deployable"
class="build-link"
class="build-link"
:href="model.last_deployment.deployable.build_
url
"
:href="model.last_deployment.deployable.build_
path
"
v-html="buildName">
v-html="buildName">
</a>
</a>
</td>
</td>
...
@@ -435,7 +435,7 @@
...
@@ -435,7 +435,7 @@
<div v-if="isStoppable && canCreateDeployment" class="inline js-stop-component-container">
<div v-if="isStoppable && canCreateDeployment" class="inline js-stop-component-container">
<stop-component
<stop-component
:stop_url="model.environment_
url
">
:stop_url="model.environment_
path
">
</stop-component>
</stop-component>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment