Merge branch 'master' into nolurk
This commit is contained in:
		
						commit
						c0e995c1d4
					
				
					 43 changed files with 1091 additions and 127 deletions
				
			
		|  | @ -123,6 +123,7 @@ angular.module('quay').directive('triggerSetupGithost', function () { | |||
| 
 | ||||
|         ApiService.listBuildTriggerSubdirs($scope.trigger['config'], params).then(function(resp) { | ||||
|           if (resp['status'] == 'error') { | ||||
|             $scope.locations = []; | ||||
|             callback(resp['message'] || 'Could not load Dockerfile locations'); | ||||
|             return; | ||||
|           } | ||||
|  |  | |||
		Reference in a new issue