Merge branch 'ncc1701' of ssh://bitbucket.org/yackob03/quay into ncc1701

This commit is contained in:
jakedt 2014-04-10 15:20:26 -04:00
commit 73f23f155c
15 changed files with 524 additions and 33 deletions

View file

@ -124,6 +124,9 @@ class DefaultConfig(object):
STATUS_TAGS[tag_name] = tag_svg.read()
# Super user config. Note: This MUST BE None for the default config.
SUPER_USERS = None
# Feature Flag: Whether billing is required.
FEATURE_BILLING = True
@ -134,4 +137,7 @@ class DefaultConfig(object):
FEATURE_GITHUB_LOGIN = True
# Feature flag, whether to enable olark chat
FEATURE_OLARK_CHAT = True
FEATURE_OLARK_CHAT = True
# Feature Flag: Whether super users are supported.
FEATURE_SUPER_USERS = False