Merge remote-tracking branch 'origin/master' into evol/api

Conflicts:
	bootstrap.py
	pyaggr3g470r/models.py
	pyaggr3g470r/notifications.py
	pyaggr3g470r/rest.py

2 files changed, 26 insertions, 1 deletions

diff --git a/migrations/versions/1b750a389c22_remove_email_notification_column.py b/migrations/versions/1b750a389c22_remove_email_notification_column.py
new file mode 100644
index 00000000..71529855
--- /dev/null
+++ b/migrations/versions/1b750a389c22_remove_email_notification_column.py
@@ -0,0 +1,25 @@
+"""remove email_notification column
+
+Revision ID: 1b750a389c22
+Revises: 48f561c0ce6
+Create Date: 2015-02-25 23:01:07.253429
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '1b750a389c22'
+down_revision = '48f561c0ce6'
+
+import conf
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    if 'sqlite' not in conf.SQLALCHEMY_DATABASE_URI:
+        op.drop_column('feed', 'email_notification')
+
+
+def downgrade():
+    op.add_column('feed', sa.Column('email_notification', sa.Boolean(),
+                  default=False))
diff --git a/migrations/versions/4b5c161e1ced_.py b/migrations/versions/4b5c161e1ced_.py
index 1fa91717..32cfe8c8 100644
--- a/migrations/versions/4b5c161e1ced_.py
+++ b/migrations/versions/4b5c161e1ced_.py
@@ -9,7 +9,7 @@ from datetime import datetime
 
 # revision identifiers, used by Alembic.
 revision = '4b5c161e1ced'
-down_revision = '48f561c0ce6'
+down_revision = '1b750a389c22'
 
 from alembic import op
 import sqlalchemy as sa