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

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

Browse source
This commit is contained in:
Jake Moshenko 2014-11-19 10:40:52 -05:00
commit b3886570eb
2 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
static/img/quay-icon-stripe.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

1
static/js/controllers.js
View file

@ -2946,6 +2946,7 @@ function ConfirmInviteCtrl($scope, $location, UserService, ApiService, Notificat
ApiService.acceptOrganizationTeamInvite(null, params).then(function(resp) { ApiService.acceptOrganizationTeamInvite(null, params).then(function(resp) {
NotificationService.update(); NotificationService.update();
UserService.load();
$location.path('/organization/' + resp.org + '/teams/' + resp.team); $location.path('/organization/' + resp.org + '/teams/' + resp.team);
}, function(resp) { }, function(resp) {
$scope.loading = false; $scope.loading = false;