Merge branch 'stadia:main' into master

SenteraLLC · Aug 23, 2024 · 717069c · 717069c
2 parents 76b81a2 + 5672b08
commit 717069c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master", "6.0-stable", "7.0-stable" ]
+    branches: [ "main", "6.0-stable", "7.0-stable" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master", "6.0-stable", "7.0-stable" ]
+    branches: [ "main", "6.0-stable", "7.0-stable" ]
   schedule:
     - cron: '26 19 * * 1'
 

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Mysql2Rgeo ActiveRecord Adapter
 
 [![Gem Version](https://badge.fury.io/rb/activerecord-mysql2rgeo-adapter.svg)](https://badge.fury.io/rb/activerecord-mysql2rgeo-adapter)
-![Test status](https://github.com/stadia/activerecord-mysql2rgeo-adapter/actions/workflows/tests.yml/badge.svg?branch=master)
-![Codeql](https://github.com/stadia/activerecord-mysql2rgeo-adapter/actions/workflows/codeql-analysis.yml/badge.svg?branch=master)
+![Test status](https://github.com/stadia/activerecord-mysql2rgeo-adapter/actions/workflows/tests.yml/badge.svg?branch=main)
+![Codeql](https://github.com/stadia/activerecord-mysql2rgeo-adapter/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)
 [![Code Climate](https://codeclimate.com/github/stadia/activerecord-mysql2rgeo-adapter.png)](https://codeclimate.com/github/stadia/activerecord-mysql2rgeo-adapter)
 
 The activerecord-mysql2rgeo-adapter provides access to features
@@ -368,4 +368,4 @@ Support is also available on the rgeo-users google group at http://groups.google
 
 Copyright Yongdae Hwang
 
-https://github.com/stadia/activerecord-mysql2rgeo-adapter/blob/master/LICENSE.txt
+https://github.com/stadia/activerecord-mysql2rgeo-adapter/blob/main/LICENSE.txt
diff --git a/activerecord-mysql2rgeo-adapter.gemspec b/activerecord-mysql2rgeo-adapter.gemspec
@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.4"
-  spec.add_development_dependency "mocha", "~> 1.1"
+  spec.add_development_dependency "mocha", "~> 2.0"
   spec.add_development_dependency "appraisal", "~> 2.0"
 end