Merge branch 'main' of github.com:bichinger/alchemy-json_api into exp…

…ose_public_on

# Conflicts:
#	app/controllers/alchemy/json_api/pages_controller.rb

.github/workflows/brakeman-analysis.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Customize the ruby version depending on your needs
       - name: Set up Ruby

.github/workflows/ci.yml

@@ -1,8 +1,10 @@
 name: Test
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   RSpec:
@@ -11,23 +13,26 @@ jobs:
       fail-fast: false
       matrix:
         alchemy_branch:
+          - 7.0-stable
+          - 7.1-stable
           - main
         ruby:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
     env:
       ALCHEMY_BRANCH: ${{ matrix.alchemy_branch }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Restore apt cache
         id: apt-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /home/runner/apt/cache
           key: apt-sqlite-
@@ -49,9 +54,9 @@ jobs:
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Restore node modules cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}-yarn-${{ hashFiles('./package.json') }}

.github/workflows/lint.yml

@@ -0,0 +1,21 @@
+name: Lint
+
+on: [pull_request]
+
+concurrency:
+  group: lint-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'main' }}
+
+jobs:
+  Standard:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.0"
+          bundler-cache: true
+      - name: Lint Ruby files
+        run: bundle exec standardrb

.gitignore

@@ -4,12 +4,10 @@ pkg/
 spec/dummy/log/*.log
 spec/dummy/tmp/
 Gemfile.lock
-spec/dummy/db/*.sqlite3
 spec/dummy/uploads
-spec/dummy/db/development.sqlite3
 spec/dummy/db/schema.rb
 spec/dummy/db/migrate
-spec/dummy/db/*.sqlite3
+spec/dummy/db/*.sqlite3*
 spec/dummy/public
 Gemfile.lock
 .ruby-version