Martyn Inglis 8dc7a86148 Merge branch 'master' into async-job-stats ...

Conflicts:
	app/dao/services_dao.py

2017-05-18 09:34:54 +01:00

..

accept_invite

…

authentication

…

aws

Add get_s3_file method for use in DVLA processing

2017-05-15 10:48:37 +01:00

celery

Merge branch 'master' into async-job-stats

2017-05-17 09:49:43 +01:00

clients

…

dao

Merge branch 'master' into async-job-stats

2017-05-18 09:34:54 +01:00

delivery

…

dvla_organisation

…

events

…

invite

…

job

…

letters

…

notifications

Merge branch 'master' into async-job-stats

2017-05-18 09:34:54 +01:00

organisation

…

provider_details

…

public_contracts

…

service

Merge pull request #956 from alphagov/add-service-permissions

2017-05-16 14:26:15 +01:00

spec

…

status

…

template

…

template_statistics

…

user

Add service permissions DAO and refactor user service permission mock

2017-05-15 17:28:14 +01:00

v2

…

__init__.py

…

conftest.py

Update to strip down DAO and clarify tests

2017-05-16 12:33:27 +01:00

db.py

Add restricted argument for service mock

2017-05-17 16:06:35 +01:00

test_cloudfoundry_config.py

…

test_config.py

…

test_encryption.py

…

test_model.py

…

test_route_authentication.py

…

test_schemas.py

…

test_statsd_decorators.py

…

test_user_agent_processing.py

…

test_utils.py

…