Merge branch 'staging' into master

MeasureAuthoringTool · Sep 27, 2023 · fe2d792 · fe2d792
2 parents 7ff4f01 + 117d8e6
commit fe2d792
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: Continuous Integration
 
 on:
   push:
-    branches: [master, bonnie-prior]
+    branches: [master, staging]
   pull_request:
-    branches: [master, bonnie-prior]
+    branches: [master, staging]
 
 jobs:
 #----main job for teaspoon tests-------

diff --git a/config/deploy/local.rb b/config/deploy/local.rb
@@ -5,7 +5,7 @@
 set :stage, :production
 
 # Tell RVM to use the current ruby when running capistrano
-set :rvm1_ruby_version, '2.4.5'
+set :rvm1_ruby_version, '2.7.2'
 
 # Set the branch to the currently checked out branch
 set :branch, `git rev-parse --abbrev-ref HEAD`.chomp

diff --git a/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee b/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee
@@ -36,7 +36,7 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', ->
     expect(editCodeSelectionView.codeSystems.includes("ICD-10-CM")).toBe true
 
   it "selects default code after deletion", ->
-    # delete the 2 codes on the first sdc
+# delete the 2 codes on the first sdc
     $('button[data-call-method="removeCode"]')[0].click()
     $('button[data-call-method="removeCode"]')[0].click()