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

Merge Dev & Staging #1441

Merged
merged 64 commits into from
Oct 7, 2024
Merged

Merge Dev & Staging #1441

merged 64 commits into from
Oct 7, 2024

Conversation

jdonis
Copy link
Contributor

@jdonis jdonis commented Oct 6, 2024 •
edited by kkrug
Loading

Description

Merge Dev & Staging to catch up with all the Eval work, solve issues with CircleCi test, updated Wallaby to be compatible with the new version of Elixir 1.16+ and OTP 26

Related Issues

[Reference any related issues, if applicable.]

Changes Made

  • [List the specific changes made in bullet points.]

Screenshots (if applicable)

[Include screenshots to visually demonstrate changes, if relevant.]

Checklist

  • PR is assigned to a project: Challenge_gov Board
  • PR is assigned to a milestone: current sprint
  • GH issues are assigned to the PR (under Development section on the right hand side)
  • PR is assigned a reviewer, and requires code review and approval by a teammate
  • New functionality is tested and all tests are green
  • I have added unit tests for new functionality or updated existing tests for changes.
  • I have updated the documentation/README accordingly, if necessary.
  • If you have DB migration, it is a "safe" migration and you've confirmed it can be rolled back.
  • If applicable, Controllers modified contain appropriate authorization plugs
  • This PR has been reviewed by at least one other team member.

jdonis and others added 30 commits April 29, 2024 22:01
@jdonis
Merge pull request #1280 from GSA/jdonis/CHAL-1751-update-JSON5
6e1bb1b 
Jdonis/CHAL-1751 Update Json5
@jdonis
Circleci Chrome update
4de37bf
@kkrug
Merge pull request #1333 from GSA/jdonis/circleci-chrome-update-1325
b43e5f4 
Jdonis/circleci chrome update 1325
@kkrug
Merge pull request #1344 from GSA/jdonis/circleci-chrome-update-1325
525794f 
Circleci Chrome Update
@jdonis
update html_sanitize_ex
ed5b0c4
@jdonis
Merge branch 'staging' into jdonis/1218-html-sanitize-ex-update
2fb15de
@kkrug
Merge pull request #1353 from GSA/jdonis/1218-html-sanitize-ex-update
915c6d0 
Jdonis/1318 html sanitize ex update
@kkrug @jdonis
Upgrade quantum to 3.5.3 in staging
54357be
@kkrug
Merge pull request #1370 from GSA/staging
e3a9f98 
Updating PROD Dependencies
@jdonis
Merge branch 'staging' of github.com:GSA/Challenge_gov into staging
c2056d1
@jdonis
Quantum update
67ef639
@jdonis
Revert "Updating PROD Dependencies "
ce9f909
@jdonis
downgrade
e059fc1
@jdonis
Merge branch 'staging' of github.com:GSA/Challenge_gov into jdonis/qu…
98f8ae7 
…antum-2
@kkrug
Merge pull request #1373 from GSA/revert-1370-staging
0276500 
Revert "Updating PROD Dependencies "
@kkrug
Merge pull request #1375 from GSA/jdonis/quantum-2
29c9df2 
Patch Quantum & html_sanitize
@jdonis
Merge branch 'staging' of github.com:GSA/Challenge_gov into staging
85784f4
@jdonis
fix merge issues
d1a789c
@jdonis
Quantum 3.5.3
e70a86f
@kkrug
Merge pull request #1378 from GSA/dependency-patch-quantum-html-sanit…
00f55a2 
…ize-prod

Dependency patch quantum html sanitize prod
@jdonis
moment -> js
9381408
@jdonis
remove uglifyjs-webpack-plugin (deprecated)
c1874bb
@kkrug
Merge pull request #1393 from GSA/jdonis/1372-serialize-javascript
5ecb334 
Jdonis/1372 serialize javascript dependabot
@jdonis
Remove Moment second part
8189c70
@jdonis
Merge branch 'staging' into jdonis/1310-moment-dependency
95600b6
@kkrug
Merge pull request #1395 from GSA/jdonis/1310-moment-dependency
3247747 
Jdonis/1310 moment dependency
@jdonis
Adding year & new webpack configuration
5078c2a
@jdonis
Merge branch 'staging' into jdonis/1310-moment-dependency
c6bd79b
@kkrug
Merge pull request #1402 from GSA/jdonis/1310-moment-dependency
f110a67 
Adding year & new webpack configuration
@jdonis
phases start & end
88b971c
kkrug and others added 24 commits August 22, 2024 12:15
@kkrug
Revert "Update jquery to 3.7.1"
0a78939 
This reverts commit cb8c3ad.
@kkrug
Merge pull request #1415 from GSA/revert-1412-1359-update-jquery
ad88c57 
Revert "Update jquery to 3.7.1"
@jdonis
New yarn.lock
22821b5
@jdonis
remove code non-gov
1f9bc0b
@jdonis
Merge branch 'staging' into 1359-update-jquery
bf5a77a
@kkrug
Merge pull request #1416 from GSA/1359-update-jquery
f4eea8a 
1359 update JQuery
@jdonis
dependency diverge 3.4 -> 3.9.2
c2cfc4d
@jdonis
non-gov validation, logs and testing
8e3a605
@jdonis
fix testing
f018f25
@jdonis
Merge branch 'staging' into jdonis/1390-non-gov-access
2a8c25e
@jdonis
closing if
8feb930
@jdonis
merge if/end issues
1c9c1b7
@kkrug
Merge pull request #1419 from GSA/jdonis/1390-non-gov-access
bd0257a 
Jdonis/1390 non gov access
@jdonis @jairoanaya
NG can't submit or create new Challenges
bc5d034
@kkrug @jdonis
Code scanning - DOM text reinterpreted as HTML #1427
6b48e4d
@kkrug @jdonis
Code scanning - DOM text reinterpreted as HTML #1427
e963b8b 
link fix
@kkrug @jdonis
Code scanning - DOM text reinterpreted as HTML #1427
aeee333 
missed uri encoding for url base
@kkrug @jdonis
Code scanning - DOM text reinterpreted as HTML #1427
cc1fa08 
URI encode fix
@jdonis
fixed conflicts
2232775
@jdonis
Updated ecto_sql
2dd57e4
@jdonis
update yarn.lock
e4467ff
@jdonis
fix testing - Wallaby & dependencies
e183b2e
@jdonis
adding tesla configuration
ccd939c
@jdonis
upgrade wallaby
f2606a2
@jdonis jdonis requested a review from kkrug October 6, 2024 21:18
@r-bartlett-gsa r-bartlett-gsa added this to the Sprint 10/08/24 milestone Oct 7, 2024
@kkrug kkrug linked an issue Oct 7, 2024 that may be closed by this pull request
Sync Staging and Dev Environments #1430
Open
7 tasks
@kkrug kkrug merged commit 6e9e2dd into dev Oct 7, 2024
6 checks passed
@kkrug kkrug deleted the combined-dev-staging branch October 7, 2024 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kkrug kkrug kkrug approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Sprint 10/08/24
Development

Successfully merging this pull request may close these issues.

Sync Staging and Dev Environments
3 participants
@jdonis @kkrug @r-bartlett-gsa