kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix typo

This commit is contained in:
Filipa Lacerda 2017-02-12 13:43:46 +00:00
parent f7d8c29e71
commit b8dbebce1d
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/javascripts/environments/components/environment_item.js.es6
View File

@ -72,7 +72,7 @@ module.exports = Vue.component('environment-item', {
* @returns {Boolean}
*/
hasLastDeploymentKey() {
if (this.model.lastest && this.model.latest.last_deployment &&
if (this.model.latest && this.model.latest.last_deployment &&
!this.$options.isObjectEmpty(this.model.latest.last_deployment)) {
return true;
}
@ -86,7 +86,7 @@ module.exports = Vue.component('environment-item', {
* @returns {Boolean|Undefined}
*/
hasManualActions() {
return this.model.lastest && this.model.latest.last_deployment &&
return this.model.latest && this.model.latest.last_deployment &&
this.model.latest.last_deployment.manual_actions &&
this.model.latest.last_deployment.manual_actions.length > 0;
},
@ -107,7 +107,7 @@ module.exports = Vue.component('environment-item', {
* @returns {Boolean|Undefined}
*/
canRetry() {
return this.model.lastest &&
return this.model.latest &&
this.hasLastDeploymentKey &&
this.model.latest.last_deployment &&
this.model.latest.last_deployment.deployable;
@ -119,7 +119,7 @@ module.exports = Vue.component('environment-item', {
* @returns {Boolean|Undefined}
*/
canShowDate() {
return this.model.lastest &&
return this.model.latest &&
this.model.latest.last_deployment &&
this.model.latest.last_deployment.deployable &&
this.model.latest.last_deployment.deployable !== undefined;
@ -131,9 +131,9 @@ module.exports = Vue.component('environment-item', {
* @returns {String}
*/
createdDate() {
if (this.model.lastest &&
if (this.model.latest &&
this.model.latest.last_deployment &&
this.model.lastest.last_deployment.deployable &&
this.model.latest.last_deployment.deployable &&
this.model.latest.last_deployment.deployable.created_at) {
return timeagoInstance.format(this.model.latest.last_deployment.deployable.created_at);
}
@ -350,7 +350,7 @@ module.exports = Vue.component('environment-item', {
*/
shouldRenderBuildName() {
return !this.model.isFolder &&
this.model.lastest &&
this.model.latest &&
!this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
!this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
},
@ -362,10 +362,10 @@ module.exports = Vue.component('environment-item', {
*/
buildPath() {
if (this.model.latest &&
this.model.lastest.last_deployment &&
this.model.latest.last_deployment &&
this.model.latest.last_deployment.deployable &&
this.model.lastest.last_deployment.deployable.build_path) {
return this.model.lastest.last_deployment.deployable.build_path;
this.model.latest.last_deployment.deployable.build_path) {
return this.model.latest.last_deployment.deployable.build_path;
}
return '';
@ -392,13 +392,13 @@ module.exports = Vue.component('environment-item', {
*/
shouldRenderDeploymentID() {
return !this.model.isFolder &&
this.model.lastest &&
this.model.latest &&
!this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
this.model.latest.last_deployment.iid !== undefined;
},
environmentPath() {
if (this.model && this.model.lastest && this.model.latest.environment_path) {
if (this.model && this.model.latest && this.model.latest.environment_path) {
return this.model.latest.environment_path;
}

2
spec/features/projects/builds_spec.rb
View File

@ -271,7 +271,7 @@ feature 'Builds', :feature do
let!(:deployment) { create(:deployment, environment: environment, sha: project.commit.id) }
let(:build) { create(:ci_build, :success, environment: environment.name, pipeline: pipeline) }
it 'shows a link to lastest deployment' do
it 'shows a link to latest deployment' do
visit namespace_project_build_path(project.namespace, project, build)
expect(page).to have_link('latest deployment')