Merge remote-tracking branch 'refs/remotes/rodney757/file_limits'

Conflicts:
	mediagoblin/db/migrations.py

diff --cc mediagoblin/config_spec.ini
Simple merge

diff --cc mediagoblin/db/migrations.py
index 62fb7e8dd3026b848c77bd4929d62744d0970e93,b3dca72c3cc1539ca1969022763b8f553d63614a..e2a0bf260647bf5b594e4e366e899f470d99bb13
--- 1/mediagoblin/db/migrations.py
--- 2/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@@ -465,12 -463,20 +465,32 @@@ def create_oauth1_tables(db)
  
  
  @RegisterMigration(15, MIGRATIONS)
 +def wants_notifications(db):
 +    """Add a wants_notifications field to User model"""
 +    metadata = MetaData(bind=db.bind)
 +    user_table = inspect_table(metadata, "core__users")
 +
 +    col = Column('wants_notifications', Boolean, default=True)
 +    col.create(user_table)
 +
 +    db.commit()
++
++
++@RegisterMigration(16, MIGRATIONS)
+ def upload_limits(db):
+     """Add user upload limit columns"""
+     metadata = MetaData(bind=db.bind)
+ 
+     user_table = inspect_table(metadata, 'core__users')
+     media_entry_table = inspect_table(metadata, 'core__media_entries')
+ 
+     col = Column('uploaded', Integer, default=0)
+     col.create(user_table)
+ 
+     col = Column('upload_limit', Integer)
+     col.create(user_table)
+ 
+     col = Column('file_size', Integer, default=0)
+     col.create(media_entry_table)
+ 
+     db.commit()

diff --cc mediagoblin/db/models.py
Simple merge