Merge branch 'red/fix_dependabot_automerge' of https://github.com/beefproject/beef into red/fix_dependabot_automerge

.github/workflows/github_actions.yml

@@ -3,27 +3,38 @@ name: 'BrowserStack Test'
 on:
   pull_request_target:
     branches: [ master ]
-    types: [ labeled ]
+    types: [ labeled, opened, synchronize ]
 
 jobs:
   ubuntu-job:
     name: 'BrowserStack Test on Ubuntu'
     runs-on: ubuntu-latest
-    if: github.event.label.name == 'safe_to_test'
+    if: |
+      github.event.label.name == 'safe_to_test' ||
+      github.event.pull_request.user.login == 'dependabot[bot]'
     env:
       GITACTIONS: true
     steps:
 
       - name: 'Remove safe_to_test label'
+        if: github.event.label.name == 'safe_to_test'
         uses: actions/github-script@v8
         with:
           script: |
-            await github.rest.issues.removeLabel({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.pull_request.number,
-              name: 'safe_to_test'
-            });
+            try {
+              await github.rest.issues.removeLabel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.payload.pull_request.number,
+                name: 'safe_to_test'
+              });
+            } catch (e) {
+              if (e.status === 404) {
+                console.log('Label already removed, skipping');
+              } else {
+                throw e;
+              }
+            }
 
       - name: 'BrowserStack Env Setup'  # Invokes the setup-env action
         uses: browserstack/github-actions/setup-env@master

Gemfile

@@ -24,7 +24,7 @@ gem 'rake', '~> 13.3'
 gem 'activerecord', '~> 8.1'
 gem 'otr-activerecord', '~> 2.6.0'
 gem 'sqlite3', '~> 2.9'
-gem 'rubocop', '~> 1.85.1', require: false
+gem 'rubocop', '~> 1.85.0', require: false
 
 # Geolocation support
 group :geoip do

Gemfile.lock

@@ -20,8 +20,8 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.9)
-      public_suffix (>= 2.0.2, < 8.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
     archive-zip (0.13.1)
       io-like (~> 0.4.0)
@@ -99,7 +99,7 @@ GEM
     logger (1.7.0)
     matrix (0.4.3)
     maxmind-db (1.4.0)
-    mcp (0.8.0)
+    mcp (0.7.1)
       json-schema (>= 4.1)
     method_source (1.1.0)
     mime-types (3.7.0)
@@ -159,7 +159,7 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (7.0.5)
+    public_suffix (6.0.2)
     qr4r (0.6.2)
       mojo_magick (~> 0.6.5)
       rqrcode_core (~> 1.0)
@@ -204,7 +204,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
-    rubocop (1.85.1)
+    rubocop (1.85.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -345,7 +345,7 @@ DEPENDENCIES
   rdoc (~> 7.2)
   rest-client (~> 2.1.0)
   rspec (~> 3.13)
-  rubocop (~> 1.85.1)
+  rubocop (~> 1.85.0)
   rubyzip (~> 3.2)
   rushover (~> 0.3.0)
   selenium-webdriver (~> 4.41)