Merge pull request #186 from CDLUC3/development

maDMP, conditional questions and google analytics
CDLUC3 · Jun 16, 2020 · 0c62710 · 0c62710
2 parents c4ea3ab + 9a15e5d
commit 0c62710
Show file tree

Hide file tree

Showing 506 changed files with 19,988 additions and 4,783 deletions.
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
@@ -98,10 +98,14 @@ jobs:
     - name: 'Yarn Install'
       run: |
         yarn install
-
+          
     # Setup the database
     - name: 'Setup Test DB'
       run: bundle exec rake db:setup RAILS_ENV=test
+
+    # Migrate
+    - name: 'Migrate DB'
+      run: bundle exec rake db:migrate RAILS_ENV=test
 
     # Compile the assets
     - name: 'Compile Assets'

diff --git a/Gemfile b/Gemfile