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

Fix broken build

Browse source
This commit is contained in:
Filipa Lacerda 2017-03-29 16:01:47 +01:00 committed by Kamil Trzcinski
parent 788f3451f7
commit 7c1bb6c349
No known key found for this signature in database
GPG key ID: 4505F5C7E12C6A5A
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/commit/pipelines/pipelines_table.js
View file

@ -98,7 +98,10 @@ export default Vue.component('pipelines-table', {
}, },
beforeUpdate() { beforeUpdate() {
if (this.state.pipelines.length && this.$children && !this.isMakingRequest) { if (this.state.pipelines.length &&
this.$children &&
!this.isMakingRequest &&
!this.isLoading) {
this.store.startTimeAgoLoops.call(this, Vue); this.store.startTimeAgoLoops.call(this, Vue);
} }
}, },

11
app/assets/javascripts/lib/utils/poll.js
View file

@ -65,7 +65,6 @@ export default class Poll {
this.makeRequest(); this.makeRequest();
}, pollInterval); }, pollInterval);
} }
this.options.successCallback(response); this.options.successCallback(response);
} }
@ -76,8 +75,14 @@ export default class Poll {
notificationCallback(true); notificationCallback(true);
return resource[method](data) return resource[method](data)
.then(response => this.checkConditions(response)) .then((response) => {
.catch(error => errorCallback(error)); this.checkConditions(response);
notificationCallback(false);
})
.catch((error) => {
notificationCallback(false);
errorCallback(error);
});
} }
/** /**

5
app/assets/javascripts/vue_pipelines_index/pipelines.js
View file

@ -157,7 +157,10 @@ export default {
}, },
beforeUpdate() { beforeUpdate() {
if (this.state.pipelines.length && this.$children && !this.isMakingRequest) { if (this.state.pipelines.length &&
this.$children &&
!this.isMakingRequest &&
!this.isLoading) {
this.store.startTimeAgoLoops.call(this, Vue); this.store.startTimeAgoLoops.call(this, Vue);
} }
}, },