diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-06-21 15:50:36 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-06-21 15:50:36 -0500 |
| commit | c482f0149d566156c4017fa58a8d57ffde90b1dc (patch) | |
| tree | 10f9c9c6191f23fdf2059583d7ba68640e63cf7e /mediagoblin/db/models.py | |
| parent | 92b22e7deac547835f69168f97012b52e87b6de4 (diff) | |
| parent | 69b888c22c326b1e69ee8e050a415561b6ca6aac (diff) | |
| download | mediagoblin-c482f0149d566156c4017fa58a8d57ffde90b1dc.tar.lz mediagoblin-c482f0149d566156c4017fa58a8d57ffde90b1dc.tar.xz mediagoblin-c482f0149d566156c4017fa58a8d57ffde90b1dc.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757-github/mail'
Diffstat (limited to 'mediagoblin/db/models.py')
| -rw-r--r-- | mediagoblin/db/models.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 2b925983..f5470cb9 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -68,12 +68,9 @@ class User(Base, UserMixin): # set to nullable=True implicitly. wants_comment_notification = Column(Boolean, default=True) license_preference = Column(Unicode) - verification_key = Column(Unicode) is_admin = Column(Boolean, default=False, nullable=False) url = Column(Unicode) bio = Column(UnicodeText) # ?? - fp_verification_key = Column(Unicode) - fp_token_expire = Column(DateTime) ## TODO # plugin data would be in a separate model |