Merge remote-tracking branch 'origin/master' into nomenclature

Conflicts:
	test/data/test.db
	workers/dockerfilebuild.py

data/migrations/versions/2fb36d4be80d_translate_the_queue_names_to_reference_.py

@@ -1,14 +1,14 @@
 """Translate the queue names to reference namespace by id, remove the namespace column.
 
 Revision ID: 2fb36d4be80d
-Revises: 3f4fe1194671
+Revises: 9a1087b007d
 Create Date: 2014-09-30 17:31:33.308490
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '2fb36d4be80d'
-down_revision = '3f4fe1194671'
+down_revision = '9a1087b007d'
 
 from alembic import op
 import sqlalchemy as sa

data/migrations/versions/3f4fe1194671_backfill_the_namespace_user_fields.py

@@ -22,4 +22,5 @@ def upgrade(tables):
 
 
 def downgrade(tables):
+    op.drop_constraint('fk_repository_namespace_user_id_user', table_name='repository', type_='foreignkey')
     op.drop_index('repository_namespace_user_id_name', table_name='repository')

data/migrations/versions/51d04d0e7e6f_email_invites_for_joining_a_team.py

@@ -74,8 +74,5 @@ def downgrade(tables):
          .where(tables.notificationkind.c.name == op.inline_literal('org_team_invite')))
         )
 
-    op.drop_index('teammemberinvite_user_id', table_name='teammemberinvite')
-    op.drop_index('teammemberinvite_team_id', table_name='teammemberinvite')
-    op.drop_index('teammemberinvite_inviter_id', table_name='teammemberinvite')
     op.drop_table('teammemberinvite')
     ### end Alembic commands ###

data/migrations/versions/9a1087b007d_allow_the_namespace_column_to_be_.py

@@ -0,0 +1,28 @@
+"""Allow the namespace column to be nullable.
+
+Revision ID: 9a1087b007d
+Revises: 3f4fe1194671
+Create Date: 2014-10-01 16:11:21.277226
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '9a1087b007d'
+down_revision = '3f4fe1194671'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade(tables):
+    op.drop_index('repository_namespace_name', table_name='repository')
+    op.alter_column('repository', 'namespace', nullable=True, existing_type=sa.String(length=255),
+                    server_default=sa.text('NULL'))
+
+
+def downgrade(tables):
+    conn = op.get_bind()
+    conn.execute('update repository set namespace = (select username from user where user.id = repository.namespace_user_id) where namespace is NULL')
+
+    op.create_index('repository_namespace_name', 'repository', ['namespace', 'name'], unique=True)
+    op.alter_column('repository', 'namespace', nullable=False, existing_type=sa.String(length=255))