Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 3e618ff
Merge: b9dff4e c17ad32
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 15:10:55 2021 -0500

    Merge pull request #227 from adhocteam/cm-367-ignore-304-and-401

    add 403 and 401 status codes to expected_status_code in newrelic.js

commit c17ad32
Merge: fdc34a2 b9dff4e
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 15:00:08 2021 -0500

    Merge branch 'main' into cm-367-ignore-304-and-401

commit b9dff4e
Merge: 5a98984 120041f
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 14:59:51 2021 -0500

    Merge pull request #222 from adhocteam/cm-302-add-maintenance-mode-script

    add and document maintenance mode

commit fdc34a2
Merge: ae18da5 5a98984
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 14:45:49 2021 -0500

    Merge branch 'main' into cm-367-ignore-304-and-401

commit 120041f
Merge: 06de998 5a98984
Author: Ryan Ahearn <[email protected]>
Date:   Thu Mar 11 14:43:36 2021 -0500

    Merge branch 'main' into cm-302-add-maintenance-mode-script

commit 06de998
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 14:39:05 2021 -0500

    make logo relative

commit f9f334f
Merge: 072692a 9369bd5
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 14:08:01 2021 -0500

    Merge branch 'main' into cm-302-add-maintenance-mode-script

commit 072692a
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 14:05:47 2021 -0500

    Squashed commit of the following:

    commit 9369bd5
    Merge: 0c44259 de255ce
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 12:47:40 2021 -0600

        Merge pull request #226 from adhocteam/js-fix-be-tests

        File upload test shouldn't error out

    commit de255ce
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 12:37:14 2021 -0600

        File upload test shouldn't error out

        FileId is now set in a before each and should no longer depend on tests
        being ran in a specific order

    commit 0c44259
    Merge: fad3c70 30fb7c1
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 11:35:55 2021 -0600

        Merge pull request #213 from adhocteam/js-332-accessibility-updates

        Accessibility updates

    commit 30fb7c1
    Merge: c1527c2 fad3c70
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 10:04:26 2021 -0600

        Merge branch 'main' into js-332-accessibility-updates

        Conflicts:
        	frontend/src/pages/ActivityReport/Pages/goalsObjectives.js

    commit fad3c70
    Merge: 79cab99 3090d99
    Author: Ryan Ahearn <[email protected]>
    Date:   Thu Mar 11 10:50:12 2021 -0500

        Merge pull request #225 from adhocteam/prod-domain-terraform

        Production domain terraform

    commit 3090d99
    Merge: 7cac1b4 79cab99
    Author: Ryan Ahearn <[email protected]>
    Date:   Thu Mar 11 10:41:25 2021 -0500

        Merge branch 'main' into prod-domain-terraform

    commit 79cab99
    Merge: 49f75a5 f9914ca
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 09:39:47 2021 -0600

        Merge pull request #216 from adhocteam/js-287-persist-goals-objectives

        Objectives/Goals are persisted

    commit c1527c2
    Merge: 9c6108f 49f75a5
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 09:31:52 2021 -0600

        Merge branch 'main' into js-332-accessibility-updates

    commit f9914ca
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 09:29:34 2021 -0600

        Return from migrations, remove granteeId from index

        Renamed migrations to ensure they are ran

    commit 7cac1b4
    Merge: 01dafc4 49f75a5
    Author: Ryan Ahearn <[email protected]>
    Date:   Thu Mar 11 10:22:42 2021 -0500

        Merge branch 'main' into prod-domain-terraform

    commit e96c77d
    Merge: 2f612d9 49f75a5
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 09:13:48 2021 -0600

        Merge branch 'main' into js-287-persist-goals-objectives

    commit 49f75a5
    Merge: bd830f9 72ea701
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 09:10:30 2021 -0600

        Merge pull request #221 from adhocteam/js-152-browser-controls

        Browser nav fix and various IE 11 fixes

    commit 01dafc4
    Author: Ryan Ahearn <[email protected]>
    Date:   Wed Mar 10 12:02:51 2021 -0500

        Add route mapping for prod url

    commit a7822a9
    Author: Ryan Ahearn <[email protected]>
    Date:   Wed Mar 10 11:50:57 2021 -0500

        Recursively delete non-prod infrastructure

    commit 72ea701
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 16:20:57 2021 -0600

        Goal picker fix for IE 11

        IE 11 doesn't place flex items properly when a `min-height` is used. Add
        a flag to the multiselect component allowing flagging it as a "single
        row" input to allow the goal picker to show up properly

    commit a270329
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 15:31:47 2021 -0600

        Attempt to force IE to not cache GET requests

    commit 2f612d9
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 12:12:41 2021 -0600

        Update activityReports query

    commit 9c6108f
    Merge: e1b9f45 bd830f9
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:44:27 2021 -0600

        Merge branch 'main' into js-332-accessibility-updates

    commit 81d795b
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:43:00 2021 -0600

        Lint fix

    commit 3d6b908
    Merge: 2b0ed3d bd830f9
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:40:02 2021 -0600

        Merge branch 'main' into js-287-persist-goals-objectives

    commit bd6ce10
    Merge: d3fcd83 bd830f9
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:33:49 2021 -0600

        Merge branch 'main' into js-152-browser-controls

    commit d3fcd83
    Merge: f0c8908 87790f3
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:32:35 2021 -0600

        Merge branch 'js-152-browser-controls' of github.com:adhocteam/Head-Start-TTADP into js-152-browser-controls

    commit f0c8908
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:32:16 2021 -0600

        Use ie11 version of react-hook-form

    commit 87790f3
    Merge: 91933c6 5e867d8
    Author: Ryan Ahearn <[email protected]>
    Date:   Tue Mar 9 19:13:05 2021 -0500

        Merge branch 'main' into js-152-browser-controls

    commit 91933c6
    Merge: b9a17b4 58723e1
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 16:15:18 2021 -0600

        Merge branch 'js-152-browser-controls' of github.com:adhocteam/Head-Start-TTADP into js-152-browser-controls

        Conflicts:
        	.circleci/config.yml

    commit b9a17b4
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 16:13:37 2021 -0600

        Update sandbox branch

    commit 58723e1
    Merge: d671ba4 bcca11c
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 15:40:45 2021 -0600

        Merge branch 'main' into js-152-browser-controls

    commit d671ba4
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 11:34:08 2021 -0600

        Browser nav fix and various IE 11 fixes

         * Push nav state instead of replace on navigation. This means the
        back/forward browser buttons work
         * Goal picker sets height = min height for the controller, this makes
        the text inside the textbox center properly in ie11
         * react-uswds ^1.12.2 was causing the page to not load in ie11.
        Downgrade to 1.11.0
         * Hex colors with transparency weren't playing nice with ie11,
        converted to rgba
         * Padding-inline wasn't working in ie11, switch to padding-left
         * Duration validation updated to actually force durations rounded to
        the half hour
         * Goal multiselect only displays "x goals selected" if there is no user
        input
         * Objectives are only focused on mount instead of when the ref changes.
        Fixes a bug where focus switches back to the objective after switching
        off

    commit e1b9f45
    Merge: 84f3d0e 5956089
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 09:35:42 2021 -0600

        Merge branch 'main' into js-332-accessibility-updates

    commit 2b0ed3d
    Merge: feb5da6 5956089
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 09:35:37 2021 -0600

        Merge branch 'main' into js-287-persist-goals-objectives

    commit 84f3d0e
    Merge: 946bfcb e7db658
    Author: Josh Salisbury <[email protected]>
    Date:   Mon Mar 8 13:19:51 2021 -0600

        Merge branch 'main' into js-332-accessibility-updates

    commit feb5da6
    Merge: 718956c e7db658
    Author: Josh Salisbury <[email protected]>
    Date:   Mon Mar 8 11:57:19 2021 -0600

        Merge branch 'main' into js-287-persist-goals-objectives

    commit 718956c
    Author: Josh Salisbury <[email protected]>
    Date:   Mon Mar 8 11:56:35 2021 -0600

        Handle report switching from grantee to non-grantee

    commit cb1b865
    Author: Josh Salisbury <[email protected]>
    Date:   Mon Mar 8 11:04:45 2021 -0600

        Objectives/Goals are persisted

         * When a report is saved the goals and objectives from the report are saved to
        the DB, udpated or created if needed
         * An ActivityReportObjective record is created for every objective
        associating the report to objective
         * Objectives that are no longer used in the report are removed from the
        DB, along with the ActivityReportObjective
         * If the goal hasn't been used on a previous report and is removed from
        the current report it is also removed
         * When a report is approved a GrantGoal record is created for every
        goal/grant pair

    commit 946bfcb
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 4 17:02:11 2021 -0600

        Update tests

    commit a2ef841
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 4 16:43:16 2021 -0600

        Update sandbox branch

    commit edccb36
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 4 16:26:41 2021 -0600

        Address accessibility issues

         * Side nav aria-label removed so the complete entry is read by screen
        readers
         * DatePicker has more helpful text announced by screen readers
         * Duration label is clearer
         * Save noticiation message is more generic and the whole message is
        read instead of just the updated date/time
         * Goal selector no longer eats tabs and can be navigated out of by a
        keyboard
         * Skip nav link placed on top of header when focused

commit ae18da5
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 13:53:47 2021 -0500

    add 403 and 401 status codes to expected_status_code in newrelic.js

commit a2f5a37
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 13:44:10 2021 -0500

    update nginx conf

commit 8482724
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 13:41:58 2021 -0500

    redirect everything to root

commit 3081c07
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 13:11:55 2021 -0500

    update nginx conf

commit 53e2207
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 11:37:06 2021 -0500

    remove default values from maintenance script

commit 4f301ce
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 11:31:27 2021 -0500

    update nginx conf

commit 9d053ea
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 11:28:20 2021 -0500

    update default -m value

commit e6610ad
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 11:16:45 2021 -0500

    Squashed commit of the following:

    commit fad3c70
    Merge: 79cab99 3090d99
    Author: Ryan Ahearn <[email protected]>
    Date:   Thu Mar 11 10:50:12 2021 -0500

        Merge pull request #225 from adhocteam/prod-domain-terraform

        Production domain terraform

    commit 3090d99
    Merge: 7cac1b4 79cab99
    Author: Ryan Ahearn <[email protected]>
    Date:   Thu Mar 11 10:41:25 2021 -0500

        Merge branch 'main' into prod-domain-terraform

    commit 79cab99
    Merge: 49f75a5 f9914ca
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 09:39:47 2021 -0600

        Merge pull request #216 from adhocteam/js-287-persist-goals-objectives

        Objectives/Goals are persisted

    commit f9914ca
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 09:29:34 2021 -0600

        Return from migrations, remove granteeId from index

        Renamed migrations to ensure they are ran

    commit 7cac1b4
    Merge: 01dafc4 49f75a5
    Author: Ryan Ahearn <[email protected]>
    Date:   Thu Mar 11 10:22:42 2021 -0500

        Merge branch 'main' into prod-domain-terraform

    commit e96c77d
    Merge: 2f612d9 49f75a5
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 09:13:48 2021 -0600

        Merge branch 'main' into js-287-persist-goals-objectives

    commit 49f75a5
    Merge: bd830f9 72ea701
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 11 09:10:30 2021 -0600

        Merge pull request #221 from adhocteam/js-152-browser-controls

        Browser nav fix and various IE 11 fixes

    commit 01dafc4
    Author: Ryan Ahearn <[email protected]>
    Date:   Wed Mar 10 12:02:51 2021 -0500

        Add route mapping for prod url

    commit a7822a9
    Author: Ryan Ahearn <[email protected]>
    Date:   Wed Mar 10 11:50:57 2021 -0500

        Recursively delete non-prod infrastructure

    commit 72ea701
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 16:20:57 2021 -0600

        Goal picker fix for IE 11

        IE 11 doesn't place flex items properly when a `min-height` is used. Add
        a flag to the multiselect component allowing flagging it as a "single
        row" input to allow the goal picker to show up properly

    commit a270329
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 15:31:47 2021 -0600

        Attempt to force IE to not cache GET requests

    commit 2f612d9
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 12:12:41 2021 -0600

        Update activityReports query

    commit 81d795b
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:43:00 2021 -0600

        Lint fix

    commit 3d6b908
    Merge: 2b0ed3d bd830f9
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:40:02 2021 -0600

        Merge branch 'main' into js-287-persist-goals-objectives

    commit bd6ce10
    Merge: d3fcd83 bd830f9
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:33:49 2021 -0600

        Merge branch 'main' into js-152-browser-controls

    commit d3fcd83
    Merge: f0c8908 87790f3
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:32:35 2021 -0600

        Merge branch 'js-152-browser-controls' of github.com:adhocteam/Head-Start-TTADP into js-152-browser-controls

    commit f0c8908
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 10 11:32:16 2021 -0600

        Use ie11 version of react-hook-form

    commit 87790f3
    Merge: 91933c6 5e867d8
    Author: Ryan Ahearn <[email protected]>
    Date:   Tue Mar 9 19:13:05 2021 -0500

        Merge branch 'main' into js-152-browser-controls

    commit 91933c6
    Merge: b9a17b4 58723e1
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 16:15:18 2021 -0600

        Merge branch 'js-152-browser-controls' of github.com:adhocteam/Head-Start-TTADP into js-152-browser-controls

        Conflicts:
        	.circleci/config.yml

    commit b9a17b4
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 16:13:37 2021 -0600

        Update sandbox branch

    commit 58723e1
    Merge: d671ba4 bcca11c
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 15:40:45 2021 -0600

        Merge branch 'main' into js-152-browser-controls

    commit d671ba4
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 11:34:08 2021 -0600

        Browser nav fix and various IE 11 fixes

         * Push nav state instead of replace on navigation. This means the
        back/forward browser buttons work
         * Goal picker sets height = min height for the controller, this makes
        the text inside the textbox center properly in ie11
         * react-uswds ^1.12.2 was causing the page to not load in ie11.
        Downgrade to 1.11.0
         * Hex colors with transparency weren't playing nice with ie11,
        converted to rgba
         * Padding-inline wasn't working in ie11, switch to padding-left
         * Duration validation updated to actually force durations rounded to
        the half hour
         * Goal multiselect only displays "x goals selected" if there is no user
        input
         * Objectives are only focused on mount instead of when the ref changes.
        Fixes a bug where focus switches back to the objective after switching
        off

    commit 2b0ed3d
    Merge: feb5da6 5956089
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 09:35:37 2021 -0600

        Merge branch 'main' into js-287-persist-goals-objectives

    commit feb5da6
    Merge: 718956c e7db658
    Author: Josh Salisbury <[email protected]>
    Date:   Mon Mar 8 11:57:19 2021 -0600

        Merge branch 'main' into js-287-persist-goals-objectives

    commit 718956c
    Author: Josh Salisbury <[email protected]>
    Date:   Mon Mar 8 11:56:35 2021 -0600

        Handle report switching from grantee to non-grantee

    commit cb1b865
    Author: Josh Salisbury <[email protected]>
    Date:   Mon Mar 8 11:04:45 2021 -0600

        Objectives/Goals are persisted

         * When a report is saved the goals and objectives from the report are saved to
        the DB, udpated or created if needed
         * An ActivityReportObjective record is created for every objective
        associating the report to objective
         * Objectives that are no longer used in the report are removed from the
        DB, along with the ActivityReportObjective
         * If the goal hasn't been used on a previous report and is removed from
        the current report it is also removed
         * When a report is approved a GrantGoal record is created for every
        goal/grant pair

commit 3950b61
Author: Chuck McAndrew <[email protected]>
Date:   Thu Mar 11 10:24:28 2021 -0500

    fix typo

commit 40f8028
Author: Chuck McAndrew <[email protected]>
Date:   Wed Mar 10 16:15:43 2021 -0500

    change sandbox branch

commit a37a1af
Author: Chuck McAndrew <[email protected]>
Date:   Wed Mar 10 14:09:24 2021 -0500

    update nginx conf

commit 8a216ee
Author: Chuck McAndrew <[email protected]>
Date:   Wed Mar 10 13:30:10 2021 -0500

    move nginx conf

commit 8fcc79b
Merge: f5df884 bd830f9
Author: Chuck McAndrew <[email protected]>
Date:   Wed Mar 10 18:27:59 2021 +0000

    Merge branch 'main' into cm-302-add-maintenance-mode-script

commit f5df884
Author: Chuck McAndrew <[email protected]>
Date:   Wed Mar 10 13:26:23 2021 -0500

    deploy to sandbox

commit b091fcc
Author: Chuck McAndrew <[email protected]>
Date:   Wed Mar 10 13:24:58 2021 -0500

    add nginx conf for maintenance page

commit c5a195e
Merge: 59377f0 5e867d8
Author: Ryan Ahearn <[email protected]>
Date:   Wed Mar 10 10:11:55 2021 -0500

    Merge branch 'main' into cm-302-add-maintenance-mode-script

commit 59377f0
Author: Chuck McAndrew <[email protected]>
Date:   Wed Mar 10 09:24:15 2021 -0500

    remove maintenance route because of oauth issues

commit 4ee6f76
Author: Chuck McAndrew <[email protected]>
Date:   Tue Mar 9 16:34:07 2021 -0500

    Squashed commit of the following:

    commit bcca11c
    Merge: 76231df a945aca
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 15:18:13 2021 -0600

        Merge pull request #205 from adhocteam/js-283-frontend-updates

        Frontend updates

    commit a945aca
    Merge: 3050a42 76231df
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 13:21:40 2021 -0600

        Merge branch 'main' into js-283-frontend-updates

    commit 3050a42
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 13:20:23 2021 -0600

        Feedback from PR

         * Deploy to sandbox
         * Attachments edit link goes to correct page
         * Resources data types change to array of text instead of array of
        strings

    commit 76231df
    Merge: d694b96 64bf3cd
    Author: Chuck McAndrew <[email protected]>
    Date:   Tue Mar 9 19:16:27 2021 +0000

        Merge pull request #218 from adhocteam/cm-302-create-mainenance-page

        Cm 302 create mainenance page

    commit d694b96
    Merge: a35691d 74ee33f
    Author: Chuck McAndrew <[email protected]>
    Date:   Tue Mar 9 16:47:39 2021 +0000

        Merge pull request #220 from adhocteam/fix-double-import

        clean up double import

    commit 74ee33f
    Merge: 275e472 a35691d
    Author: Chuck McAndrew <[email protected]>
    Date:   Tue Mar 9 16:36:10 2021 +0000

        Merge branch 'main' into fix-double-import

    commit 275e472
    Author: Chuck McAndrew <[email protected]>
    Date:   Tue Mar 9 11:32:11 2021 -0500

        clean up double import

    commit a35691d
    Merge: 5956089 ff1c224
    Author: Chuck McAndrew <[email protected]>
    Date:   Tue Mar 9 16:04:41 2021 +0000

        Merge pull request #219 from adhocteam/cm-add-new-relic-to-worker

        add new relic to worker.js

    commit ff1c224
    Author: Chuck McAndrew <[email protected]>
    Date:   Tue Mar 9 10:50:47 2021 -0500

        move require to start of file.

    commit 77173a4
    Merge: eadf312 5956089
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 9 09:35:09 2021 -0600

        Merge branch 'main' into js-283-frontend-updates

    commit 4931466
    Author: Chuck McAndrew <[email protected]>
    Date:   Tue Mar 9 09:49:04 2021 -0500

        add new relic to worker.js

    commit eadf312
    Merge: 64db2a9 e7db658
    Author: Josh Salisbury <[email protected]>
    Date:   Mon Mar 8 13:22:32 2021 -0600

        Merge branch 'main' into js-283-frontend-updates

        Conflicts:
        	frontend/src/pages/ActivityReport/Pages/components/Goal.js
        	src/seeders/20201124160449-users.js

    commit 64db2a9
    Author: Josh Salisbury <[email protected]>
    Date:   Fri Mar 5 12:12:07 2021 -0600

        PR feedback

         * Set required font-family/size via uswds class
         * Use uswds margin classes instead of `smart-hub--*` classes
         * Wrap group of `await` calls in `Promise.all` inside resource
        migration
         * Remove File `attachmentType` field
         * Change trashcan icon's color to black to match other trashcan icons

    commit 9438d3f
    Merge: 0cf6743 92a929b
    Author: Josh Salisbury <[email protected]>
    Date:   Thu Mar 4 11:17:37 2021 -0600

        Merge branch 'main' into js-283-frontend-updates

        Conflicts:
        	.circleci/config.yml
        	frontend/src/pages/ActivityReport/Pages/topicsResources.js

    commit 0cf6743
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 3 13:33:22 2021 -0600

        Dev/stagging now only forward migrate

    commit e8b33b9
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 3 12:19:24 2021 -0600

        Remove josh as a user in the seeders

    commit 642917c
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 3 11:20:24 2021 -0600

        Update HSES id for josh

    commit 68be3b0
    Merge: 354ab9f 36f3803
    Author: Josh Salisbury <[email protected]>
    Date:   Wed Mar 3 09:57:32 2021 -0600

        Merge branch 'main' into js-283-frontend-updates

    commit 354ab9f
    Merge: eeef66a 079fc8b
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 2 16:57:42 2021 -0600

        Merge branch 'js-283-frontend-updates' of github.com:adhocteam/Head-Start-TTADP into js-283-frontend-updates

    commit eeef66a
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 2 16:57:13 2021 -0600

        Lint fix

    commit 079fc8b
    Merge: 01a6806 d0f5a95
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 2 16:55:12 2021 -0600

        Merge branch 'main' into js-283-frontend-updates

    commit 01a6806
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 2 16:34:57 2021 -0600

        Update sandbox branch

    commit 0603eb0
    Author: Josh Salisbury <[email protected]>
    Date:   Tue Mar 2 16:33:14 2021 -0600

        Various frontend changes to better match design

         * Add resource selector
         * Virtual delivery method field added
         * Fix styling (margins colors etc)
         * Copy updates

commit d501eff
Author: Chuck McAndrew <[email protected]>
Date:   Tue Mar 9 16:08:06 2021 -0500

    add and document maintenance mode
  • Loading branch information
@dcmcand
dcmcand committed Mar 11, 2021
1 parent 2782bf2 commit 40f393e
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/newrelic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,10 @@ exports.config = {
'response.headers.x*',
],
},
error_collector: {
expected_status_codes: [
'401',
'403',
],
},
};

0 comments on commit 40f393e

Please sign in to comment.