Skip to content

Commit

Permalink
Merge branch 'develop' into snyk-upgrade-1170a08bf2f79a56c9d88dcf9d7e…
Browse files Browse the repository at this point in the history
…4dfc
  • Loading branch information
pbardy2000 authored Aug 12, 2024
2 parents 37008ad + e78d142 commit d65925f
Show file tree
Hide file tree
Showing 34 changed files with 1,958 additions and 6,851 deletions.
2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@ jest.config.js
protractor.conf.js
/src/app/api/*
/mock-api
/cypress
/.vscode
/.storybook
/.husky
/.github
setenv.ts
setup-jest.ts
cypress.config.ts
jest-global-mocks.ts
environment.deploy.ts
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
vtm-app:
uses: ./.github/workflows/deploy.yml
with:
branch: 'master'
branch: ${{ github.ref_name }}
environment: 'prod'
bucket: '.prod'
secrets:
Expand Down
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,6 @@ testem.log
.DS_Store
Thumbs.db

# Cypress
cypress.env.json
cypress/videos
cypress/screenshots
runner-results
multi-reporter-config.json
cypress/parallel-weights.json

report.json
# Sentry Config File
.sentryclirc
14 changes: 0 additions & 14 deletions cypress.config.ts

This file was deleted.

Loading

0 comments on commit d65925f

Please sign in to comment.