6254 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rebecca Law	cc17ba3ad9	Merge pull request #2455 from alphagov/pyup-scheduled-update-2019-04-10 ... Scheduled weekly dependency update for week 14	2019-04-17 13:50:42 +01:00
Rebecca Law	0730f9d9e1	Merge branch 'master' into pyup-scheduled-update-2019-04-10	2019-04-17 11:37:47 +01:00
Rebecca Law	b30969dbcf	Update requirements.txt	2019-04-17 11:35:42 +01:00
Chris Hill-Scott	96bb9e19f9	Merge pull request #2385 from alphagov/raise-if-fail-to-write-history ... Raise exception if history can’t be written	2019-04-17 11:17:49 +01:00
Chris Hill-Scott	2c57e4a4f6	Merge pull request #2445 from alphagov/remove-domains-from-branding-migration ... Remove domain columns from branding table	2019-04-17 11:02:27 +01:00
Chris Hill-Scott	916d4e2860	Remove domain columns from branding table ... This relationship is via the `Organisation` now; we don’t use this column to fudge a relationship based on the user’s email address and the matching something in these columns.	2019-04-15 16:14:41 +01:00
Chris Hill-Scott	8929911ad8	Merge pull request #2444 from alphagov/remove-domains-from-branding ... Stop updating or reading domain columns on branding table	2019-04-15 15:35:09 +01:00
Rebecca Law	6ccb242107	Merge pull request #2458 from alphagov/remove-unused-method ... Remove unused method.	2019-04-15 12:11:00 +01:00
Rebecca Law	d5ae740f83	Merge pull request #2459 from alphagov/update-response-for-duplicate-domains ... The previous PR added a error handler for the wrong db exception.	2019-04-15 12:10:44 +01:00
Chris Hill-Scott	c6447c111d	Don’t let admin specify branding for new service ... It doesn’t need to because the API code works it all out now by looking at the organisation.	2019-04-12 16:42:50 +01:00
Chris Hill-Scott	9bca2432ce	Merge pull request #2463 from alphagov/remove-domain-required-letter-branding-schema ... Don’t require a domain when updating the letter branding	2019-04-12 16:16:00 +01:00
Pea (Malgorzata Tyczynska)	88b31c51f5	Merge pull request #2437 from alphagov/precompiled-overlay-failed-validation ... Precompiled request preview with overlay when validation fails	2019-04-12 16:14:56 +01:00
Chris Hill-Scott	9c0b9171a1	Don’t require a domain when updating the letter branding ... So the admin is free to stop passing it in.	2019-04-12 16:05:29 +01:00
Chris Hill-Scott	ee966668bd	Remove domain columns from branding table ... This relationship is via the `Organisation` now; we don’t use this column to fudge a relationship based on the user’s email address and the matching something in these columns.	2019-04-12 15:53:17 +01:00
Chris Hill-Scott	a39ed098b8	Merge pull request #2442 from alphagov/default-branding-for-nhs-users ... Set default branding for NHS services	2019-04-12 15:29:30 +01:00
Alexey Bezhan	ebd12d7e76	Merge pull request #2461 from alphagov/firetext-url-config-env ... Make Firetext URL configurable through the application environment	2019-04-12 13:40:25 +01:00
Alexey Bezhan	330afab5e2	Make Firetext URL configurable through the application environment ... Similar to MMG, there's a new env variable FIRETEXT_URL that can be used to override the Firetext api URL. This will be used to stub out both providers during the load test or can be used to run a local API against a fake provider endpoint.	2019-04-12 12:03:58 +01:00
Leo Hemsted	09decfe3a8	Merge pull request #2460 from alphagov/forgot-about-beat ... add delivery-celery-beat to paas_app_wrapper	2019-04-12 11:25:02 +01:00
Leo Hemsted	95ca533df2	add delivery-celery-beat to paas_app_wrapper ... Forget about beats by dre	2019-04-12 11:10:18 +01:00
Rebecca Law	22fc4b693a	The previous PR added a error handler for the wrong db exception. ... This corrects it to look for the unique constraint.	2019-04-12 10:55:21 +01:00
Leo Hemsted	5d26724022	Merge pull request #2456 from alphagov/remove-multi-app-manifests ... Remove multi app manifests	2019-04-12 10:34:49 +01:00
Rebecca Law	1c68e0f565	Remove unused method. ... last_n_days was only being used in a test.	2019-04-12 10:26:46 +01:00
Rebecca Law	622b3e76f7	Merge pull request #2454 from alphagov/populate-volumne-intentions ... Command to populate the volume intentions for services.	2019-04-12 09:44:57 +01:00
Rebecca Law	b7ecaa4a40	Merge pull request #2453 from alphagov/update-response-for-duplicate-domains ... Return a useful message if the domain is a duplicate.	2019-04-12 09:44:29 +01:00
Pea Tyczynska	2d71aea7a1	Get rid of an unneeded flag - destination endpoint is slimmer now and doesnt need it	2019-04-11 16:33:40 +01:00
Chris Hill-Scott	08f67dcfdd	Merge pull request #2457 from alphagov/count-live-services-and-organisations ... Add method to count of live services and orgs	2019-04-11 16:22:54 +01:00
Leo Hemsted	3277c65a7c	add jinja2-cli to dev requirements	2019-04-11 15:05:44 +01:00
Leo Hemsted	c786258a60	give instances and NOTIFY_APP_NAME sensible defaults ... NOTIFY_APP_NAME follows precedent and just tries to strip 'notify-' from the beginning of the string. instances is not specified at all if not defined - it'll scale up to the same amount of instances as currently present, and then the autoscaler will take over anyway	2019-04-11 14:57:22 +01:00
Pea Tyczynska	dd9e285684	Refactor preview_letter_template_by_notification_id	2019-04-11 14:27:57 +01:00
Pea Tyczynska	63fe210202	Also show overlay on document download of failed letter ... And of course test this new flex	2019-04-11 14:27:12 +01:00
Pea Tyczynska	2f52a8fd64	Call overlaid preview for precompiled letters that fail validation ... Also test precompiled letter preview with overlay	2019-04-11 14:26:59 +01:00
Chris Hill-Scott	6bfd999de2	Add method to count of live services and orgs ... So that we don’t have to update the home page manually any more.	2019-04-11 13:54:43 +01:00
Leo Hemsted	575ec96b6b	fix test that checks manifest contains references to all queues	2019-04-10 16:48:21 +01:00
Leo Hemsted	8cc5d40291	remove old manifest files and creation script	2019-04-10 15:21:30 +01:00
Leo Hemsted	7d9cd58e89	rename public-api to api ... we don't use the public-api bit anywhere - even cloudwatch overwrites based on CW_APP_NAME (which we can get rid of as this distinction is gone)	2019-04-10 15:19:46 +01:00
Leo Hemsted	66ca98fbfb	create manifest from jinja template ... newer versions of cf api don't allow you to have multiple apps per manifest file. So, instead of our current inheritance based model, move to the newer doc-dl/antivirus/template-preview approved jinja based model. the new single manifest.yml.j2 file sets a bunch of variables based on the CF_APP variable - things like NOTIFY_APP_NAME, default instances, etc. Then the manifest is built up to define all of the app options based on these defaults. Things default to sensible values, which can vary based on environment. When adding new environment variables, you'll need to add them to the manifest file. If they're json encoded lists, you'll need to pass them back to the `tojson` filter, or jinja2 will print them as python lists, with single quotes around strings.	2019-04-10 15:15:48 +01:00
pyup-bot	adcdac636e	Update sqlalchemy from 1.2.18 to 1.3.2	2019-04-10 14:00:12 +01:00
pyup-bot	bd51d82443	Update psycopg2-binary from 2.7.7 to 2.8.1	2019-04-10 14:00:11 +01:00
pyup-bot	0efce16ebf	Update marshmallow from 2.19.1 to 2.19.2	2019-04-10 14:00:09 +01:00
pyup-bot	670a50127d	Update eventlet from 0.23.0 to 0.24.1	2019-04-10 14:00:08 +01:00
pyup-bot	ee4f0d1b59	Update cffi from 1.12.1 to 1.12.2	2019-04-10 14:00:07 +01:00
Rebecca Law	ba8ab45edf	Command to populate the volume intentions for services.	2019-04-10 13:38:12 +01:00
Alexey Bezhan	3845e90ee4	Merge pull request #2452 from alphagov/pin-gunicorn-pyup ... Stop pyup from trying to upgrade gunicorn	2019-04-10 13:35:01 +01:00
Rebecca Law	f35960c3a3	Return a useful message if the domain is a duplicate.	2019-04-10 13:23:34 +01:00
Rebecca Law	707d0c349b	Merge pull request #2451 from alphagov/stop-using-history-for-perf-platform ... Switch table in query to Notification from NotificationHistory	2019-04-10 12:58:40 +01:00
Alexey Bezhan	d43b53db73	Stop pyup from trying to upgrade gunicorn	2019-04-10 11:32:11 +01:00
Rebecca Law	a53340b4d7	Update the query that gets the number of notifications that have been sent under 10 seconds to use Notifications rather than NotificationHistory. ... Also removed a test that is not useful	2019-04-10 10:06:27 +01:00
Leo Hemsted	fe77d4f654	move commands from manifest to procfile ... cf v3 commands don't appear to support commands in manifest files. They say that they do, but in practice they fail on cf v3-zdt-push with an error message "No process types returned from stager". This can be solved by moving the command from the manifest to a Procfile. However, the Procfile is part of the source code, and as such is the same for each app. To get around this, make the Procfile command invoke a new wrapper script, which checks the NOTIFY_APP_NAME env var and then calls the correct command	2019-04-09 17:05:56 +01:00
Rebecca Law	193ff8548c	Merge pull request #2450 from alphagov/email-branding-unique-constraint ... Update EmailBranding.name to be not null and unique.	2019-04-09 14:47:09 +01:00
Rebecca Law	e5663ceec9	Merge pull request #2448 from alphagov/fix-alert-for-ack-file ... The rstrip() was not working for all file names.	2019-04-09 14:36:22 +01:00