Merge remote-tracking branch 'origin/main' into expose-cursor_columns

.github/CONTRIBUTING.md

@@ -14,7 +14,7 @@ Before engaging with this community, please read and understand our
 ## Setting up development environment
 
 * The gem follows standard Rails practices:
-  * `bundle install` to install dependencies
+  * `bin/setup` to install dependencies
   * `bin/rails server` to start the server
   * `bin/rails test` to run tests
   * `bin/rails test:system` to run system tests

.github/workflows/ci.yml

@@ -6,22 +6,26 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }} / ${{ matrix.database }}
+    timeout-minutes: 5
     strategy:
       fail-fast: false
       matrix:
         gemfile: [Gemfile, gemfiles/rails_6_0.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_edge.gemfile]
-        ruby: ["3.0", "3.1", "3.2"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
         database: [sqlite]
         include:
           - gemfile: "gemfiles/postgresql.gemfile"
             ruby: 3.2
             database: postgres
+        exclude:
+          - gemfile: "gemfiles/rails_edge.gemfile"
+            ruby: 3.0
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
       DB: ${{ matrix.database }}
     steps:
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
@@ -47,8 +51,9 @@ jobs:
     - name: RuboCop
       run: bundle exec rubocop
     - name: Archive system test artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
-        name: screenshots
+        name: screenshots-${{ strategy.job-index }}
         path: test/dummy/tmp/screenshots
+        if-no-files-found: ignore

.github/workflows/stale.yml

@@ -0,0 +1,26 @@
+name: "Close stale issues"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          days-before-issue-stale: 60
+          exempt-issue-labels: "Blocked"
+          days-before-issue-close: 14
+          stale-issue-label: "stale"
+          stale-issue-message: >
+            This issue has been marked as stale because it has not been commented on in two months.
+
+            Please reply in order to keep the issue open. Otherwise, it will close in 14 days.
+
+            Thank you for contributing!
+

.ruby-version

@@ -1 +1 @@
-3.2.1
+3.3.0

Gemfile

@@ -8,8 +8,6 @@ gem "better_html"
 gem "capybara"
 gem "debug"
 gem "mocha"
-gem "net-http" # Ruby 2.7 stdlib's net/http loads net/protocol relatively, which loads both the stdlib and gem version
-gem "net-smtp" # mail is missing a dependency on net-smtp https://github.com/mikel/mail/pull/1439
 gem "puma"
 if defined?(@rails_gem_requirement) && @rails_gem_requirement
   # causes Dependabot to ignore the next line and update the next gem "rails"
@@ -20,8 +18,7 @@ else
 end
 gem "rubocop"
 gem "rubocop-shopify"
-gem "selenium-webdriver", "< 4.10.1"
+gem "selenium-webdriver"
 gem "sprockets-rails"
 gem "sqlite3"
-gem "webdrivers", require: false
 gem "yard"