External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 02:47:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into workflow-channels

Browse Source
This commit is contained in:
Wayne Witzel III
2016-11-17 16:22:52 -05:00
parent 9dda4d452f cf8f12c1f0
commit 62d0b9fc98
40 changed files with 942 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0034_v310_add_workflows.py
View File

@@ -79,7 +79,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='workflowjob',
name='workflow_job_template',
field=models.ForeignKey(related_name='jobs', on_delete=django.db.models.deletion.SET_NULL, default=None, blank=True, to='main.WorkflowJobTemplate', null=True),
field=models.ForeignKey(related_name='workflow_jobs', on_delete=django.db.models.deletion.SET_NULL, default=None, blank=True, to='main.WorkflowJobTemplate', null=True),
),
migrations.AddField(
model_name='activitystream',