Resolve main/develop conflict #273
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Release/3.0
Release/3.2
Release 3.3
* The correct copy for Document Upload now appears for admins on the service. * fixes issue with users using safari --------- Co-authored-by: paul-lawlor-tco <[email protected]> Co-authored-by: JamieGunnCO <[email protected]>
…d-wrap-1.2.4 Bump word-wrap from 1.2.3 to 1.2.4
…d_yarn/word-wrap-1.2.4 Revert "Bump word-wrap from 1.2.3 to 1.2.4"
* TMI2-253: Add pre-commit check and update .gitignore to include application-local.properties and .env.local * Added conditional logic to display department on user page (#72) * GAP-2129 remove call to email findagrant for posting application form to grant advert (#66) * GAP-2129 | remove instruction to email findagrant for adding application form to grant advert * GAP-2129|make changes to copy as per GDS styling * Changed copy to be consistent with the description shown to applicants for file upload. * GAP-2230: frontend times out when requesting many submissions (#90) * GAP-2230: Removing await so it calls the backend to start sending messages to SQS and doesnt wait for its response * Cache dependencies on failure * Separating out pipelines to admin/applicant/gap-web-ui (#100) ### Continuous Integration - Separating out feature workflow into each package - Triggering on paths related to the specific package plus some others, e.g. for the admin app: ``` - "packages/admin/**" - ".github/workflows/admin-feature.yml" - "package.json" - "yarn.lock" ``` - This results in if you only ever change the admin app during a PR, then only this pipeline runs. - If you also e.g. change the applicant app mid way through, both workflows must pass - Caching dependencies using node-setup@v3 - Separating out Snyk as a new workflow ### Continuous Deployment - Separated into multiple workflows and triggering with the same path changes as before, but with the addition of any changes to gap-web-ui i.e: ``` - "packages/admin/**" - "packages/gap-web-ui/**" - ".github/workflows/admin-pushImage.yml" - "package.json" - "yarn.lock" --------- Co-authored-by: Iain Cooper <[email protected]> Co-authored-by: iaincooper-tco <[email protected]> Co-authored-by: ryan-tco <[email protected]> Co-authored-by: ConorFayleTCO <[email protected]> Co-authored-by: conor <[email protected]> Co-authored-by: john-tco <[email protected]> Co-authored-by: jgunnCO <[email protected]> Co-authored-by: paul-lawlor-tco <[email protected]> Co-authored-by: JamieGunnCO <[email protected]> Co-authored-by: a-lor-cab <[email protected]>
Release/4.0
Co-authored-by: rachelswart <[email protected]>
Release/5.0
TMI2-499: Fixing layout of unpublish advert page
Release/6.0
Release/7.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Ticket # and link
Summary of the changes and the related issue. List any dependencies that are required for this change:
Type of change
Please check the relevant options.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes:
Unit Test
Integration Test (if applicable)
End to End Test (if applicable)
Screenshots (if appropriate):
Please attach screenshots of the change if it is a UI change:
Checklist: