Skip to content

Commit

Permalink
Merge branch 'main' into deployment
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
#	requirements.txt
#	vis_phewas/vis_phewas/settings.py
  • Loading branch information
tnaccarato committed Aug 13, 2024
2 parents 5fc3938 + a49bc32 commit 1bd5adc
Show file tree
Hide file tree
Showing 38 changed files with 10,035 additions and 525 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/check-secrets.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
name: Check Secrets

on:
push:
branches:
- '**' # This allows the workflow to run on any branch when there's a push
pull_request:
branches:
- '**' # This allows the workflow to run on any branch when a pull request is opened
workflow_dispatch: # Allows manual triggering of the workflow on any branch

jobs:
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,5 @@ bundle.js
/vis_phewas/staticfiles
*.env
docker-compose.yml
/cert.pem
/key.pem
*.pem
/vis_phewas/media
Loading

0 comments on commit 1bd5adc

Please sign in to comment.