Skip to content

Commit fc0c5ba

Browse files
authored
Merge pull request #932 from helgi/DRF_341
chore(requirements): Update to DRF 3.4.1
2 parents a36a8f6 + f3bbc11 commit fc0c5ba

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

rootfs/api/models/app.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ class App(UuidAuditedModel):
8686
structure = JSONField(default={}, blank=True, validators=[validate_app_structure])
8787

8888
class Meta:
89+
verbose_name = 'Application'
8990
permissions = (('use_app', 'Can use app'),)
9091
ordering = ['id']
9192

rootfs/api/tests/deployments/test_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def test_app_override_id(self, mock_requests):
8888
self.assertEqual(response.status_code, 201, response.data)
8989
body = {'id': response.data['id']}
9090
response = self.client.post('/v2/apps', body)
91-
self.assertContains(response, 'App with this id already exists.', status_code=400)
91+
self.assertContains(response, 'Application with this id already exists.', status_code=400)
9292
return response
9393

9494
@mock.patch('requests.get')

rootfs/api/tests/test_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def test_app_override_id(self, mock_requests):
8686
self.assertEqual(response.status_code, 201, response.data)
8787
body = {'id': response.data['id']}
8888
response = self.client.post('/v2/apps', body)
89-
self.assertContains(response, 'App with this id already exists.', status_code=400)
89+
self.assertContains(response, 'Application with this id already exists.', status_code=400)
9090
return response
9191

9292
@mock.patch('requests.get')

rootfs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ backoff==1.2.1
33
Django==1.9.8
44
django-cors-headers==1.1.0
55
django-guardian==1.4.4
6-
djangorestframework==3.4.0
6+
djangorestframework==3.4.1
77
docker-py==1.9.0
88
gunicorn==19.6.0
99
jmespath==0.9.0

0 commit comments

Comments
 (0)