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

Merge pull request #6722 from wenottingham/over-the-ramparts-we-no-longer-watch

Browse Source 
Remove 'rampart' from a user-facing string.

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-15 21:52:57 +00:00
committed by GitHub
parent eba0e4fd77 8e3931de37
commit e3b5d64aa7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0006_v320_release.py
View File

@@ -464,7 +464,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='unifiedjob', model_name='unifiedjob',
name='instance_group', name='instance_group',
field=models.ForeignKey(on_delete=models.SET_NULL, default=None, blank=True, to='main.InstanceGroup', help_text='The Rampart/Instance group the job was run under', null=True), field=models.ForeignKey(on_delete=models.SET_NULL, default=None, blank=True, to='main.InstanceGroup', help_text='The Instance group the job was run under', null=True),
), ),
migrations.AddField( migrations.AddField(
model_name='unifiedjobtemplate', model_name='unifiedjobtemplate',

2
awx/main/migrations/0032_v330_polymorphic_delete.py
View File

@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='unifiedjob', model_name='unifiedjob',
name='instance_group', name='instance_group',
field=models.ForeignKey(blank=True, default=None, help_text='The Rampart/Instance group the job was run under', null=True, on_delete=awx.main.utils.polymorphic.SET_NULL, to='main.InstanceGroup'), field=models.ForeignKey(blank=True, default=None, help_text='The Instance group the job was run under', null=True, on_delete=awx.main.utils.polymorphic.SET_NULL, to='main.InstanceGroup'),
), ),
] ]

2
awx/main/models/unified_jobs.py
View File

@@ -707,7 +707,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
null=True, null=True,
default=None, default=None,
on_delete=polymorphic.SET_NULL, on_delete=polymorphic.SET_NULL,
help_text=_('The Rampart/Instance group the job was run under'), help_text=_('The Instance group the job was run under'),
) )
organization = models.ForeignKey( organization = models.ForeignKey(
'Organization', 'Organization',