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

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

Browse source 
Conflicts:
	app.py
This commit is contained in:
Jake Moshenko 2014-05-13 16:55:02 -04:00
commit 11c6c5fa52
10 changed files with 75 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app.py
View file

@ -16,6 +16,7 @@ from data.users import UserAuthentication
from util.analytics import Analytics
from util.exceptionlog import Sentry
from data.billing import Billing
from data.buildlogs import BuildLogs
OVERRIDE_CONFIG_FILENAME = 'conf/stack/config.py'
@ -49,6 +50,7 @@ userfiles = Userfiles(app)
analytics = Analytics(app)
billing = Billing(app)
sentry = Sentry(app)
build_logs = BuildLogs(app)
authentication = UserAuthentication(app)
database.configure(app.config)