Merge branch 'develop' into dependabot/bundler/nokogiri-1.14.3

sanger · Jan 3, 2024 · 2f671c7 · 2f671c7
2 parents 889451d + 8d0e99a
commit 2f671c7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ruby_ci.yml b/.github/workflows/ruby_ci.yml
@@ -15,7 +15,7 @@ jobs:
     services:
       mysql:
         # Use the Mysql docker image https://hub.docker.com/_/mysql
-        image: mysql:5.7 # Using 5.7 to map to what is used in production.
+        image: mysql:8.0
         ports:
          - 3306:3306 # Default port mappings
          # Monitor the health of the container to mesaure when it is ready

diff --git a/.release-version b/.release-version
@@ -1 +1 @@
-3.6.0
+3.7.0
diff --git a/Gemfile b/Gemfile
@@ -64,7 +64,7 @@ group :test do
   gem 'launchy'
   gem 'rspec-collection_matchers'
   gem 'rspec-rails', '~> 3.5.0'
-  gem 'selenium-webdriver', '~> 4.1', require: false
+  gem 'selenium-webdriver', require: false
   gem 'simplecov', require: false
   gem 'timecop'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -320,7 +320,7 @@ DEPENDENCIES
   rubocop-rspec
   sass-rails (~> 6.0)
   sdoc (~> 2.4.0)
-  selenium-webdriver (~> 4.1)
+  selenium-webdriver
   simplecov
   spring
   timecop