Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve new merge conflicts #485

Merged
merged 71 commits into from
Nov 15, 2021
Merged

Resolve new merge conflicts #485

merged 71 commits into from
Nov 15, 2021

Conversation

thewatermethod
Copy link
Collaborator

Description of change

Merge HHS changes in again

How to test

Issue(s)

Checklists

Every PR

  • Meets issue criteria
  • JIRA ticket status updated
  • Code is meaningfully tested
  • Meets accessibility standards (WCAG 2.1 Levels A, AA)
  • API Documentation updated
  • Boundary diagram updated
  • Logical Data Model updated
  • Architectural Decision Records written for major infrastructure decisions

Production Deploy

  • Staging smoke test completed

After merge/deploy

  • Update JIRA ticket status

dependabot bot and others added 30 commits November 3, 2021 19:34
@dependabot
Bump validator from 13.6.0 to 13.7.0
0e254d3 
Bumps [validator](https://github.com/validatorjs/validator.js) from 13.6.0 to 13.7.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](validatorjs/validator.js@13.6.0...13.7.0)

---
updated-dependencies:
- dependency-name: validator
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@thewatermethod
welcoming robots in certain situations
396d600
@thewatermethod
merging upstream
0c5506b
@kryswisnaskas
Update known vulnerabilities
d8a7a14
@kryswisnaskas
Merge branch 'main' into dependabot/npm_and_yarn/validator-13.7.0
a4e076f
@thewatermethod
trying a different approach in the config
4058cf3
@thewatermethod
is this how we set vars?
e408022
@thewatermethod
fix var name
eef4486
@thewatermethod
test on dev since sandbox does not do what I thought
a8a74e3
@AdamAdHocTeam
update trusworks with modal changes
3c59900
@thewatermethod
need to learn how to do bash
f8833c1
@thewatermethod
more bash better
b7ed5c5
@thewatermethod
for christmas sake
7116b31
@thewatermethod
testing complete
2634a59
@thewatermethod
fix bash script var names
ece825e
@AdamAdHocTeam
updated file uploader modal
6f59aa4
@AdamAdHocTeam
updated external resource modal
78c046a
@thewatermethod
move logic to circlci config
93dd0da
@thewatermethod
Merge remote-tracking branch upstream/main into TTAHUB276
901a356
@thewatermethod
awaken robot on prod
7321977
@thewatermethod @jasalisbury
Update .circleci/config.yml
d844f45 
Co-authored-by: Josh Salisbury <[email protected]>
@thewatermethod
Merge pull request HHS#613 from HHS/TTAHUB276
b40e3fc 
welcoming robots in certain situations
@thewatermethod
Merge remote-tracking branch 'upstream/main' into TTAHUB-430/add-appr…
828231c 
…oved-and-created-date-to-ar
@thewatermethod
add approvedat migration
223030d
@thewatermethod
update approvedAt on approval
45c726d
@thewatermethod
clean up constants, add new one
c712df7
@thewatermethod
add approved and created dates to fe landing page
adcabcc
@thewatermethod
add approved and created date to csv download
758665a
@thewatermethod
remove console statement
281d6ac
@thewatermethod
fixing tests
be49632
AdamAdHocTeam and others added 24 commits November 11, 2021 14:13
@AdamAdHocTeam
unique id value
7097b97
@kryswisnaskas
update known issues
d722740
@AdamAdHocTeam
fix axe
bee703d
@kryswisnaskas
Update known vulnerabilities
c6c4362
@kryswisnaskas
Merge pull request HHS#607 from HHS/dependabot/npm_and_yarn/validator…
ec9b761 
…-13.7.0

Bump validator from 13.6.0 to 13.7.0
@AdamAdHocTeam
fix axe again
586cb11
@AdamAdHocTeam
fix axe issues again
1a4b0bd
@AdamAdHocTeam
try heading axe fix
04060a3
@AdamAdHocTeam
update test for axe
ae9801f
@AdamAdHocTeam
update
11df756
@AdamAdHocTeam
see if remvoing display none fixes issue
3d48d9a
@AdamAdHocTeam
hide headings
01d756e
@AdamAdHocTeam
limit number of headings
2f0a8bb
@AdamAdHocTeam
added cusom accordion with heading size prop
c3f6a8c
@AdamAdHocTeam
added test for accordion
0847c79
@thewatermethod
fix capitalizations while we're here
feac881
@AdamAdHocTeam
fixes based on Kryss comments
761638b
@thewatermethod
Merge pull request HHS#618 from HHS/ttahub-451/add-target-pop
182f83d 
[TTAHUB-451] Add target populations to approved report
@thewatermethod
Merge pull request HHS#616 from HHS/TTAHUB-430/add-approved-and-creat…
f170803 
…ed-date-to-ar

[TTAHUB-430] add approved and created date to activity report tables
@AdamAdHocTeam
Merge branch 'main' into ttahub-345-upgrade-all-packages
a063067
@AdamAdHocTeam
linter fixes
89d6301
@AdamAdHocTeam
audit vuln
296a1f3
@AdamAdHocTeam
Merge pull request HHS#617 from HHS/ttahub-345-upgrade-all-packages
5e61e12 
TTAHUB-345 Upgrade to Trussworks 2.0 Component Library
@thewatermethod
Merge remote-tracking branch upstream/main into 11-15-resolve-merge-c…
652f1c3 
…onflicts
@thewatermethod thewatermethod self-assigned this Nov 15, 2021
@thewatermethod thewatermethod removed their assignment Nov 15, 2021
AdamAdHocTeam
AdamAdHocTeam approved these changes Nov 15, 2021
View reviewed changes
Copy link

@AdamAdHocTeam AdamAdHocTeam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@thewatermethod thewatermethod merged commit 3fbe926 into main Nov 15, 2021
@thewatermethod thewatermethod deleted the 11-15-resolve-merge-conflicts branch November 15, 2021 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AdamAdHocTeam AdamAdHocTeam AdamAdHocTeam approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thewatermethod @AdamAdHocTeam @kryswisnaskas