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

Merge branch 'master' into tutorial

Browse source 
Conflicts:
	static/directives/header-bar.html
This commit is contained in:
jakedt 2014-02-13 16:54:02 -05:00
commit 8135e0266e
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -36,7 +36,6 @@ start the workers:
``` ```
STACK=prod python -m workers.diffsworker -D STACK=prod python -m workers.diffsworker -D
STACK=prod python -m workers.dockerfilebuild -D
STACK=prod python -m workers.webhookworker -D STACK=prod python -m workers.webhookworker -D
``` ```

2
endpoints/api.py
View file

@ -1234,7 +1234,7 @@ def request_repo_build(namespace, repository):
'build_uuid': build_request.uuid, 'build_uuid': build_request.uuid,
'namespace': namespace, 'namespace': namespace,
'repository': repository, 'repository': repository,
})) }), retries_remaining=1)
log_action('build_dockerfile', namespace, log_action('build_dockerfile', namespace,
{'repo': repository, 'namespace': namespace, {'repo': repository, 'namespace': namespace,

2
static/directives/header-bar.html
View file

@ -15,7 +15,7 @@
<div class="collapse navbar-collapse navbar-ex1-collapse"> <div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a ng-href="/repository/" target="{{ appLinkTarget() }}">Repositories</a></li> <li><a ng-href="/repository/" target="{{ appLinkTarget() }}">Repositories</a></li>
<li><a href="http://docs.quay.io/">Documentation</a></li> <li><a href="http://docs.quay.io/" target="_blank">Documentation</a></li>
<li><a ng-href="/tutorial/" target="{{ appLinkTarget() }}">Tutorial</a></li> <li><a ng-href="/tutorial/" target="{{ appLinkTarget() }}">Tutorial</a></li>
<li><a ng-href="/plans/" target="{{ appLinkTarget() }}">Pricing</a></li> <li><a ng-href="/plans/" target="{{ appLinkTarget() }}">Pricing</a></li>
<li><a ng-href="/organizations/" target="{{ appLinkTarget() }}">Organizations</a></li> <li><a ng-href="/organizations/" target="{{ appLinkTarget() }}">Organizations</a></li>

2
static/js/app.js
View file

@ -2550,7 +2550,7 @@ quayApp.directive('buildLogCommand', function () {
return title; return title;
} }
return '<i class="fa fa-hdd-o"></i> <a href="' + registryHandlers[registry](pieces) + '">' + title + '</a>'; return '<i class="fa fa-hdd-o"></i> <a href="' + registryHandlers[registry](pieces) + '" target="_blank">' + title + '</a>';
} }
}; };