Merge branch 'master' into email-templates-part-2

migrations/versions/0015_add_permissions.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 0015_add_permissions
+Revises: 0014_job_id_nullable
+Create Date: 2016-02-19 14:16:59.359493
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0015_add_permissions'
+down_revision = '0014_job_id_nullable'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('permissions', postgresql.ARRAY(sa.String()), nullable=True))
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'permissions')
+    ### end Alembic commands ###

migrations/versions/0015_add_subject_line.py

@@ -1,14 +1,14 @@
 """empty message
 
 Revision ID: 0015_add_subject_line
-Revises: 0014_job_id_nullable
+Revises: 0015_add_permissions
 Create Date: 2016-02-18 09:43:29.282804
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '0015_add_subject_line'
-down_revision = '0014_job_id_nullable'
+down_revision = '0015_add_permissions'
 
 from alembic import op
 import sqlalchemy as sa