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
Boxiang Sun
gitlab-ce
Commits
92d80b68
Commit
92d80b68
authored
Feb 25, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use vhtml only when necessary
parent
f17109c0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
7 deletions
+3
-7
app/assets/javascripts/environments/components/environment.js.es6
...ts/javascripts/environments/components/environment.js.es6
+1
-2
app/assets/javascripts/environments/components/environment_actions.js.es6
...cripts/environments/components/environment_actions.js.es6
+1
-3
app/assets/javascripts/environments/components/environment_terminal_button.js.es6
...nvironments/components/environment_terminal_button.js.es6
+1
-1
app/assets/javascripts/vue_shared/components/table_pagination.js.es6
...javascripts/vue_shared/components/table_pagination.js.es6
+0
-1
No files found.
app/assets/javascripts/environments/components/environment.js.es6
View file @
92d80b68
...
@@ -173,8 +173,7 @@ module.exports = Vue.component('environment-component', {
...
@@ -173,8 +173,7 @@ module.exports = Vue.component('environment-component', {
<environment-table
<environment-table
:environments="state.environments"
:environments="state.environments"
:can-create-deployment="canCreateDeploymentParsed"
:can-create-deployment="canCreateDeploymentParsed"
:can-read-environment="canReadEnvironmentParsed">
:can-read-environment="canReadEnvironmentParsed"/>
</environment-table>
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
:change="changePage"
:change="changePage"
...
...
app/assets/javascripts/environments/components/environment_actions.js.es6
View file @
92d80b68
...
@@ -28,9 +28,7 @@ module.exports = Vue.component('actions-component', {
...
@@ -28,9 +28,7 @@ module.exports = Vue.component('actions-component', {
data-method="post"
data-method="post"
rel="nofollow"
rel="nofollow"
class="js-manual-action-link">
class="js-manual-action-link">
${playIconSvg}
<span class="js-action-play-icon-container" v-html="playIconSvg"></span>
<span>
<span>
{{action.name}}
{{action.name}}
</span>
</span>
...
...
app/assets/javascripts/environments/components/environment_terminal_button.js.es6
View file @
92d80b68
...
@@ -20,7 +20,7 @@ module.exports = Vue.component('terminal-button-component', {
...
@@ -20,7 +20,7 @@ module.exports = Vue.component('terminal-button-component', {
template: `
template: `
<a class="btn terminal-button"
<a class="btn terminal-button"
:href="terminalPath">
:href="terminalPath">
<span class="js-terminal-icon-container" v-html="terminalIconSvg"></span>
${terminalIconSvg}
</a>
</a>
`,
`,
});
});
app/assets/javascripts/vue_shared/components/table_pagination.js.es6
View file @
92d80b68
...
@@ -19,7 +19,6 @@ window.Vue = require('vue');
...
@@ -19,7 +19,6 @@ window.Vue = require('vue');
/**
/**
This function will take the information given by the pagination component
This function will take the information given by the pagination component
And make a new Turbolinks call
Here is an example `change` method:
Here is an example `change` method:
...
...
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