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
Tatuya Kamada
gitlab-ce
Commits
3768de80
Commit
3768de80
authored
Dec 08, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Uniformize props name format
parent
1c529171
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
34 additions
and
33 deletions
+34
-33
app/assets/javascripts/environments/components/environment_external_url.js.es6
...s/environments/components/environment_external_url.js.es6
+2
-2
app/assets/javascripts/environments/components/environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+8
-8
app/assets/javascripts/environments/components/environment_rollback.js.es6
...ripts/environments/components/environment_rollback.js.es6
+5
-4
app/assets/javascripts/environments/components/environment_stop.js.es6
...vascripts/environments/components/environment_stop.js.es6
+2
-2
app/assets/javascripts/vue_common_component/commit.js.es6
app/assets/javascripts/vue_common_component/commit.js.es6
+9
-9
spec/javascripts/environments/environment_external_url_spec.js.es6
...scripts/environments/environment_external_url_spec.js.es6
+1
-1
spec/javascripts/environments/environment_rollback_spec.js.es6
...javascripts/environments/environment_rollback_spec.js.es6
+6
-6
spec/javascripts/environments/environment_stop_spec.js.es6
spec/javascripts/environments/environment_stop_spec.js.es6
+1
-1
No files found.
app/assets/javascripts/environments/components/environment_external_url.js.es6
View file @
3768de80
...
@@ -7,14 +7,14 @@
...
@@ -7,14 +7,14 @@
window.gl.environmentsList.ExternalUrlComponent = Vue.component('external-url-component', {
window.gl.environmentsList.ExternalUrlComponent = Vue.component('external-url-component', {
props: {
props: {
external
_u
rl: {
external
U
rl: {
type: String,
type: String,
default: '',
default: '',
},
},
},
},
template: `
template: `
<a class="btn external_url" :href="external
_u
rl" target="_blank">
<a class="btn external_url" :href="external
U
rl" target="_blank">
<i class="fa fa-external-link"></i>
<i class="fa fa-external-link"></i>
</a>
</a>
`,
`,
...
...
app/assets/javascripts/environments/components/environment_item.js.es6
View file @
3768de80
...
@@ -461,9 +461,9 @@
...
@@ -461,9 +461,9 @@
<div v-if="!isFolder && hasLastDeploymentKey" class="js-commit-component">
<div v-if="!isFolder && hasLastDeploymentKey" class="js-commit-component">
<commit-component
<commit-component
:tag="commitTag"
:tag="commitTag"
:commit
_
ref="commitRef"
:commit
-
ref="commitRef"
:commit
_
url="commitUrl"
:commit
-
url="commitUrl"
:short
_
sha="commitShortSha"
:short
-
sha="commitShortSha"
:title="commitTitle"
:title="commitTitle"
:author="commitAuthor"
:author="commitAuthor"
:commit-icon-svg="commitIconSvg">
:commit-icon-svg="commitIconSvg">
...
@@ -495,22 +495,22 @@
...
@@ -495,22 +495,22 @@
<div v-if="model.external_url && canReadEnvironment"
<div v-if="model.external_url && canReadEnvironment"
class="inline js-external-url-container">
class="inline js-external-url-container">
<external-url-component
<external-url-component
:external
_
url="model.external_url">
:external
-
url="model.external_url">
</external
_
url-component>
</external
-
url-component>
</div>
</div>
<div v-if="isStoppable && canCreateDeployment"
<div v-if="isStoppable && canCreateDeployment"
class="inline js-stop-component-container">
class="inline js-stop-component-container">
<stop-component
<stop-component
:stop
_
url="model.stop_path">
:stop
-
url="model.stop_path">
</stop-component>
</stop-component>
</div>
</div>
<div v-if="canRetry && canCreateDeployment"
<div v-if="canRetry && canCreateDeployment"
class="inline js-rollback-component-container">
class="inline js-rollback-component-container">
<rollback-component
<rollback-component
:is
_last_
deployment="isLastDeployment"
:is
-last-
deployment="isLastDeployment"
:retry
_
url="retryUrl">
:retry
-
url="retryUrl">
</rollback-component>
</rollback-component>
</div>
</div>
</div>
</div>
...
...
app/assets/javascripts/environments/components/environment_rollback.js.es6
View file @
3768de80
...
@@ -7,19 +7,20 @@
...
@@ -7,19 +7,20 @@
window.gl.environmentsList.RollbackComponent = Vue.component('rollback-component', {
window.gl.environmentsList.RollbackComponent = Vue.component('rollback-component', {
props: {
props: {
retry
_u
rl: {
retry
U
rl: {
type: String,
type: String,
default: '',
default: '',
},
},
is_last_deployment: {
isLastDeployment: {
type: Boolean,
type: Boolean,
default: true,
default: true,
},
},
},
},
template: `
template: `
<a class="btn" :href="retry
_u
rl" data-method="post" rel="nofollow">
<a class="btn" :href="retry
U
rl" data-method="post" rel="nofollow">
<span v-if="is
_last_d
eployment">
<span v-if="is
LastD
eployment">
Re-deploy
Re-deploy
</span>
</span>
<span v-else>
<span v-else>
...
...
app/assets/javascripts/environments/components/environment_stop.js.es6
View file @
3768de80
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
window.gl.environmentsList.StopComponent = Vue.component('stop-component', {
window.gl.environmentsList.StopComponent = Vue.component('stop-component', {
props: {
props: {
stop
_u
rl: {
stop
U
rl: {
type: String,
type: String,
default: '',
default: '',
},
},
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
template: `
template: `
<a class="btn stop-env-link"
<a class="btn stop-env-link"
:href="stop
_u
rl"
:href="stop
U
rl"
data-confirm="Are you sure you want to stop this environment?"
data-confirm="Are you sure you want to stop this environment?"
data-method="post"
data-method="post"
rel="nofollow">
rel="nofollow">
...
...
app/assets/javascripts/vue_common_component/commit.js.es6
View file @
3768de80
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
* name
* name
* ref_url
* ref_url
*/
*/
commit
_r
ef: {
commit
R
ef: {
type: Object,
type: Object,
required: false,
required: false,
default: () => ({}),
default: () => ({}),
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
/**
/**
* Used to link to the commit sha.
* Used to link to the commit sha.
*/
*/
commit
_u
rl: {
commit
U
rl: {
type: String,
type: String,
required: false,
required: false,
default: '',
default: '',
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
/**
/**
* Used to show the commit short_sha that links to the commit url.
* Used to show the commit short_sha that links to the commit url.
*/
*/
short
_s
ha: {
short
S
ha: {
type: String,
type: String,
required: false,
required: false,
default: '',
default: '',
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
* @returns {Boolean}
* @returns {Boolean}
*/
*/
hasCommitRef() {
hasCommitRef() {
return this.commit
_ref && this.commit_ref.name && this.commit_r
ef.ref_url;
return this.commit
Ref && this.commitRef.name && this.commitR
ef.ref_url;
},
},
/**
/**
...
@@ -125,15 +125,15 @@
...
@@ -125,15 +125,15 @@
<a v-if="hasCommitRef"
<a v-if="hasCommitRef"
class="monospace branch-name"
class="monospace branch-name"
:href="commit
_r
ef.ref_url">
:href="commit
R
ef.ref_url">
{{commit
_r
ef.name}}
{{commit
R
ef.name}}
</a>
</a>
<div v-html="commitIconSvg" class="commit-icon"></div>
<div v-html="commitIconSvg" class="commit-icon"></div>
<a class="commit-id monospace"
<a class="commit-id monospace"
:href="commit
_u
rl">
:href="commit
U
rl">
{{short
_s
ha}}
{{short
S
ha}}
</a>
</a>
<p class="commit-title">
<p class="commit-title">
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
</a>
</a>
<a class="commit-row-message"
<a class="commit-row-message"
:href="commit
_u
rl">
:href="commit
U
rl">
{{title}}
{{title}}
</a>
</a>
</span>
</span>
...
...
spec/javascripts/environments/environment_external_url_spec.js.es6
View file @
3768de80
...
@@ -12,7 +12,7 @@ describe('External URL Component', () => {
...
@@ -12,7 +12,7 @@ describe('External URL Component', () => {
const component = new window.gl.environmentsList.ExternalUrlComponent({
const component = new window.gl.environmentsList.ExternalUrlComponent({
el: document.querySelector('.test-dom-element'),
el: document.querySelector('.test-dom-element'),
propsData: {
propsData: {
external
_u
rl: externalURL,
external
U
rl: externalURL,
},
},
});
});
...
...
spec/javascripts/environments/environment_rollback_spec.js.es6
View file @
3768de80
...
@@ -13,8 +13,8 @@ describe('Rollback Component', () => {
...
@@ -13,8 +13,8 @@ describe('Rollback Component', () => {
const component = new window.gl.environmentsList.RollbackComponent({
const component = new window.gl.environmentsList.RollbackComponent({
el: document.querySelector('.test-dom-element'),
el: document.querySelector('.test-dom-element'),
propsData: {
propsData: {
retry
_u
rl: retryURL,
retry
U
rl: retryURL,
is
_last_d
eployment: true,
is
LastD
eployment: true,
},
},
});
});
...
@@ -25,8 +25,8 @@ describe('Rollback Component', () => {
...
@@ -25,8 +25,8 @@ describe('Rollback Component', () => {
const component = new window.gl.environmentsList.RollbackComponent({
const component = new window.gl.environmentsList.RollbackComponent({
el: document.querySelector('.test-dom-element'),
el: document.querySelector('.test-dom-element'),
propsData: {
propsData: {
retry
_u
rl: retryURL,
retry
U
rl: retryURL,
is
_last_d
eployment: true,
is
LastD
eployment: true,
},
},
});
});
...
@@ -38,8 +38,8 @@ describe('Rollback Component', () => {
...
@@ -38,8 +38,8 @@ describe('Rollback Component', () => {
const component = new window.gl.environmentsList.RollbackComponent({
const component = new window.gl.environmentsList.RollbackComponent({
el: document.querySelector('.test-dom-element'),
el: document.querySelector('.test-dom-element'),
propsData: {
propsData: {
retry
_u
rl: retryURL,
retry
U
rl: retryURL,
is
_last_d
eployment: false,
is
LastD
eployment: false,
},
},
});
});
...
...
spec/javascripts/environments/environment_stop_spec.js.es6
View file @
3768de80
...
@@ -13,7 +13,7 @@ describe('Stop Component', () => {
...
@@ -13,7 +13,7 @@ describe('Stop Component', () => {
component = new window.gl.environmentsList.StopComponent({
component = new window.gl.environmentsList.StopComponent({
el: document.querySelector('.test-dom-element'),
el: document.querySelector('.test-dom-element'),
propsData: {
propsData: {
stop
_u
rl: stopURL,
stop
U
rl: stopURL,
},
},
});
});
});
});
...
...
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