vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into swaggerlikeus

Browse source 
Conflicts:
	endpoints/api.py
This commit is contained in:
jakedt 2014-03-25 15:50:03 -04:00
commit 5f98bf8dab
5 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/app.js
View file

@ -3544,6 +3544,9 @@ quayApp.directive('buildMessage', function () {
controller: function($scope, $element) {
$scope.getBuildMessage = function (phase) {
switch (phase) {
case 'cannot_load':
return 'Cannot load build status - Please report this error';
case 'starting':
case 'initializing':
return 'Starting Dockerfile build';
@ -3598,6 +3601,7 @@ quayApp.directive('buildProgress', function () {
case 'initializing':
case 'starting':
case 'waiting':
case 'cannot_load':
return 0;
break;
}