8000 Merge branch 'activeadmin:master' into master · activeadmin/activeadmin@55f6afd · GitHub
[go: up one dir, main page]
Skip to content

Commit 55f6afd

Browse files
rogerkkrogerkk
authored
Merge branch 'activeadmin:master' into master
2 parents 3a74ef8 + ab49cb8 commit 55f6afd

File tree

208 files changed

+4861
-3827
lines changed
  • resource_extension.rb
  • form_builder.rb
  • helpers
  • inputs/filters
  • localizers.rb
  • menu_item.rb
  • namespace.rb
  • namespace_settings.rb
  • orm
  • pundit_adapter.rb
  • resource.rb
  • resource_collection.rb
  • resource_dsl.rb
  • resource
  • scope.rb
  • version.rb
  • view_helpers
  • views
  • activeadmin.rb
  • generators/active_admin
  • package.json
  • plugin.js
  • rollup.config.js
  • spec
  • tasks
  • vendor/javascript
  • yarn.lock

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    208 files changed

    +4861
    -3827
    lines changed

    ‎.github/dependabot.yml

    Lines changed: 9 additions & 9 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,6 +17,9 @@ updates:
    1717
    rails_default:
    1818
    patterns:
    1919
    - "*"
    20+
    ignore:
    21+
    - dependency-name: sqlite3
    22+
    versions: ">= 2" # FIXME: Remove when rails/rails#51636 will be released
    2023
    - package-ecosystem: npm
    2124
    directory: /
    2225
    schedule:
    @@ -26,15 +29,6 @@ updates:
    2629
    npm:
    2730
    patterns:
    2831
    - "*"
    29-
    - package-ecosystem: bundler
    30-
    directory: /docs
    31-
    schedule:
    32-
    interval: monthly
    33-
    versioning-strategy: lockfile-only
    34-
    groups:
    35-
    docs:
    36-
    patterns:
    37-
    - "*"
    3832
    - package-ecosystem: bundler
    3933
    directory: /gemfiles/rails_61
    4034
    schedule:
    @@ -44,6 +38,9 @@ updates:
    4438
    rails_61:
    4539
    patterns:
    4640
    - "*"
    41+
    ignore:
    42+
    - dependency-name: sqlite3
    43+
    versions: ">= 2"
    4744
    - package-ecosystem: bundler
    4845
    directory: /gemfiles/rails_70
    4946
    schedule:
    @@ -53,3 +50,6 @@ updates:
    5350
    rails_70:
    5451
    patterns:
    5552
    - "*"
    53+
    ignore:
    54+
    - dependency-name: sqlite3
    55+
    versions: ">= 2"

    ‎.github/release.yml

    Lines changed: 19 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,23 @@
    11
    changelog:
    2+
    categories:
    3+
    - title: Breaking Changes 🚨
    4+
    labels:
    5+
    - type breaking change
    6+
    - title: Template Updates 📝
    7+
    labels:
    8+
    - type template update
    9+
    - title: Enhancements ✨
    10+
    labels:
    11+
    - type enhancement
    12+
    - title: Bug Fixes 🐛
    13+
    labels:
    14+
    - type bug fix
    15+
    - title: Security Fixes 🔒
    16+
    labels:
    17+
    - type security fix
    18+
    - title: Other Changes 🛠
    19+
    labels:
    20+
    - "*"
    221
    exclude:
    322
    authors:
    423
    - dependabot

    ‎.github/workflows/bug-report-template.yml

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,7 +11,7 @@ concurrency:
    1111
    cancel-in-progress: ${{ github.event_name == 'pull_request' }}
    1212

    1313
    env:
    14-
    RUBY_VERSION: ruby-3.2
    14+
    RUBY_VERSION: ruby-3.3
    1515

    1616
    jobs:
    1717
    bug_report_template_test:
    @@ -21,7 +21,7 @@ jobs:
    2121
    runs-on: ubuntu-latest
    2222
    steps:
    2323
    - uses: actions/checkout@v4
    24-
    - uses: tj-actions/changed-files@v41
    24+
    - uses: tj-actions/changed-files@v45
    2525
    id: changed-files
    2626
    with:
    2727
    files: |

    ‎.github/workflows/ci.yaml

    Original file line numberDiff line numberDiff line change
    @@ -12,54 +12,60 @@ concurrency:
    1212

    1313
    jobs:
    1414
    test:
    15-
    name: test (${{ matrix.ruby }}, ${{ matrix.deps }})
    15+
    name: test (${{ matrix.ruby }}, ${{ matrix.rails }})
    1616
    runs-on: ${{ matrix.os }}
    1717
    timeout-minutes: 15
    1818
    strategy:
    1919
    fail-fast: false
    2020
    matrix:
    2121
    ruby:
    22-
    - 3.2
    23-
    - 3.1
    24-
    - '3.0'
    22+
    - "3.3"
    23+
    - "3.2"
    24+
    - "3.1"
    2525
    os:
    2626
    - ubuntu-latest
    27-
    deps:
    28-
    - rails_61
    29-
    - rails_70
    27+
    rails:
    28+
    - rails_80
    29+
    - rails_72
    3030
    - rails_71
    31+
    - rails_70
    32+
    exclude:
    33+
    - ruby: '3.1'
    34+
    os: ubuntu-latest
    35+
    rails: rails_80
    3136
    steps:
    3237
    - uses: actions/checkout@v4
    3338
    - name: Configure bundler (default)
    3439
    run: |
    3540
    echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
    36-
    if: matrix.deps == 'rails_71'
    41+
    if: matrix.rails == 'rails_80'
    3742
    - name: Configure bundler (alternative)
    3843
    run: |
    39-
    echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}/Gemfile" >> "$GITHUB_ENV"
    40-
    if: matrix.deps != 'rails_71'
    44+
    echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.rails }}/Gemfile" >> "$GITHUB_ENV"
    45+
    if: matrix.rails != 'rails_80'
    4146
    - uses: ruby/setup-ruby@v1
    4247
    with:
    4348
    ruby-version: ${{ matrix.ruby }}
    4449
    bundler-cache: true
    50+
    rubygems: latest
    4551
    - name: Create test app
    4652
    run: bin/rake setup
    4753
    - name: Restore cached RSpec runtimes
    48-
    uses: actions/cache@v3
    54+
    uses: actions/cache@v4
    4955
    with:
    5056
    path: tmp/parallel_runtime_rspec.log
    51-
    key: runtimes-rspec-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_rspec.log') }}
    57+
    key: runtimes-rspec-${{ matrix.ruby }}-${{ matrix.rails }}-${{ hashFiles('tmp/parallel_runtime_rspec.log') }}
    5258
    - name: Run RSpec tests
    5359
    env:
    5460
    COVERAGE: true
    5561
    run: |
    5662
    bin/parallel_rspec
    5763
    RSPEC_FILESYSTEM_CHANGES=true bin/rspec
    5864
    - name: Restore cached cucumber runtimes
    59-
    uses: actions/cache@v3
    65+
    uses: actions/cache@v4
    6066
    with:
    6167
    path: tmp/parallel_runtime_cucumber.log
    62-
    key: runtimes-cucumber-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_cucumber.log') }}
    68+
    key: runtimes-cucumber-${{ matrix.ruby }}-${{ matrix.rails }}-${{ hashFiles('tmp/parallel_runtime_cucumber.log') }}
    6369
    - name: Run Cucumber features
    6470
    env:
    6571
    COVERAGE: true
    @@ -68,16 +74,18 @@ jobs:
    6874
    bin/cucumber --profile filesystem-changes
    6975
    bin/cucumber --profile class-reloading
    7076
    - name: Rename coverage file by matrix run
    71-
    run: mv coverage/coverage.xml coverage/coverage-ruby-${{ matrix.ruby }}-${{ matrix.deps }}.xml
    77+
    run: mv coverage/coverage.xml coverage/coverage-ruby-${{ matrix.ruby }}-${{ matrix.rails }}.xml
    7278
    - uses: actions/upload-artifact@v4
    7379
    with:
    74-
    name: coverage-ruby-${{ matrix.ruby }}-${{ matrix.deps }}
    80+
    name: coverage-ruby-${{ matrix.ruby }}-${{ matrix.rails }}
    7581
    path: coverage
    7682
    if-no-files-found: error
    7783

    7884
    upload_coverage:
    7985
    name: Upload Coverage
    8086
    runs-on: ubuntu-latest
    87+
    # Do not run on forks
    88+
    if: ${{ github.repository_owner == 'activeadmin' }}
    8189
    needs: [test]
    8290
    steps:
    8391
    - uses: actions/checkout@v4
    @@ -86,7 +94,30 @@ jobs:
    8694
    path: coverage
    8795
    pattern: coverage-ruby-*
    8896
    merge-multiple: true
    89-
    - uses: codecov/codecov-action@v3
    97+
    - uses: codecov/codecov-action@v5
    9098
    with:
    99+
    token: ${{ secrets.CODECOV_TOKEN }}
    91100
    directory: coverage
    92101
    fail_ci_if_error: true
    102+
    103+
    test_docs_build:
    104+
    name: Build docs
    105+
    runs-on: ubuntu-latest
    106+
    steps:
    107+
    - uses: actions/checkout@v4
    108+
    - uses: tj-actions/changed-files@v45
    109+
    id: changed-files
    110+
    with:
    111+
    files: |
    112+
    docs/**
    113+
    package*.json
    114+
    yarn.lock
    115+
    - uses: actions/setup-node@v4
    116+
    if: steps.changed-files.outputs.any_changed == 'true'
    117+
    with:
    118+
    node-version: 22
    119+
    cache: yarn
    120+
    - run: yarn install
    121+
    if: steps.changed-files.outputs.any_changed == 'true'
    122+
    - run: yarn docs:build
    123+
    if: steps.changed-files.outputs.any_changed == 'true'
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,47 @@
    1+
    name: Docs Deployment
    2+
    3+
    on:
    4+
    release:
    5+
    types:
    6+
    - published
    7+
    workflow_dispatch:
    8+
    9+
    # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
    10+
    permissions:
    11+
    contents: read
    12+
    pages: write
    13+
    id-token: write
    14+
    15+
    # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
    16+
    # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
    17+
    concurrency:
    18+
    group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
    19+
    cancel-in-progress: false
    20+
    21+
    jobs:
    22+
    build_docs:
    23+
    name: Build docs
    24+
    runs-on: ubuntu-latest
    25+
    steps:
    26+
    - uses: actions/checkout@v4
    27+
    - uses: actions/setup-node@v4
    28+
    with:
    29+
    node-version: 22
    30+
    cache: yarn
    31+
    - uses: actions/configure-pages@v5
    32+
    - run: yarn install
    33+
    - run: yarn docs:build
    34+
    - uses: actions/upload-pages-artifact@v3
    35+
    with:
    36+
    path: docs/.vitepress/dist
    37+
    38+
    deploy_docs:
    39+
    name: Deploy docs site
    40+
    runs-on: ubuntu-latest
    41+
    needs: build_docs
    42+
    environment:
    43+
    name: github-pages
    44+
    url: ${{ steps.deployment.outputs.page_url }}
    45+
    steps:
    46+
    - uses: actions/deploy-pages@v4
    47+
    id: deployment
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,33 @@
    1+
    name: ESLint
    2+
    3+
    on:
    4+
    pull_request:
    5+
    6+
    env:
    7+
    NODE_VERSION: ${{ vars.ESLINT_NODE_VERSION || '20.x' }}
    8+
    9+
    jobs:
    10+
    eslint:
    11+
    name: Run eslint
    12+
    runs-on: ubuntu-latest
    13+
    steps:
    14+
    - uses: actions/checkout@v4
    15+
    - uses: actions/setup-node@v4
    16+
    with:
    17+
    node-version: ${{ env.NODE_VERSION }}
    18+
    cache: yarn
    19+
    - uses: tj-actions/changed-files@v45
    20+
    id: changed-files
    21+
    with:
    22+
    files: |
    23+
    **.js
    24+
    package*.json
    25+
    yarn.lock
    26+
    .github/workflows/eslint.yml
    27+
    - uses: reviewdog/action-eslint@v1
    28+
    if: steps.changed-files.outputs.any_changed == 'true'
    29+
    with:
    30+
    github_token: ${{ secrets.GITHUB_TOKEN }}
    31+
    filter_mode: nofilter # added (default), diff_context, file, nofilter
    32+
    fail_level: any
    33+
    reporter: github-pr-check
    Original file line numberDiff line numberDiff line change
    @@ -2,13 +2,6 @@ name: Gherkin Lint
    22

    33
    on:
    44
    pull_request:
    5-
    # If updating `paths` then update gherkin-lint-none.yml to match
    6-
    paths:
    7-
    - '.github/workflows/gherkin-lint.yml'
    8-
    - '.gherkin-lintignore'
    9-
    - '.gherkin-lintrc'
    10-
    - 'package*.json'
    11-
    - '**.feature'
    125

    136
    env:
    147
    NODE_VERSION: 20.x
    @@ -19,9 +12,21 @@ jobs:
    1912
    runs-on: ubuntu-latest
    2013
    steps:
    2114
    - uses: actions/checkout@v4
    15+
    - uses: tj-actions/changed-files@v45
    16+
    id: changed-files
    17+
    with:
    18+
    files: |
    19+
    **.feature
    20+
    .gherkin-lintrc
    21+
    package*.json
    22+
    yarn.lock
    23+
    .github/workflows/gherkin-lint.yml
    2224
    - uses: actions/setup-node@v4
    25+
    if: steps.changed-files.outputs.any_changed == 'true'
    2326
    with:
    2427
    node-version: ${{ env.NODE_VERSION }}
    25-
    cache: 'yarn'
    26-
    - run: bin/yarn install --frozen-lockfile --immutable
    27-
    - run: bin/yarn gherkin-lint
    28+
    cache: yarn
    29+
    - run: yarn install --frozen-lockfile --immutable
    30+
    if: steps.changed-files.outputs.any_changed == 'true'
    31+
    - run: yarn gherkin-lint
    32+
    if: steps.changed-files.outputs.any_changed == 'true'
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,24 @@
    1+
    name: GitHub Actions Lint
    2+
    3+
    on:
    4+
    pull_request:
    5+
    6+
    jobs:
    7+
    github_actions_lint:
    8+
    name: Run actionlint
    9+
    runs-on: ubuntu-latest
    10+
    steps:
    11+
    - uses: actions/checkout@v4
    12+
    - uses: tj-actions/changed-files@v45
    13+
    id: changed-files
    14+
    with:
    15+
    files: |
    16+
    .github/workflows/*.yaml
    17+
    .github/workflows/*.yml
    18+
    - uses: reviewdog/action-actionlint@v1
    19+
    if: steps.changed-files.outputs.any_changed == 'true'
    20+
    with:
    21+
    fail_level: any
    22+
    filter_mode: nofilter # added (default), diff_context, file, nofilter
    23+
    github_token: ${{ secrets.GITHUB_TOKEN }}
    24+
    reporter: github-pr-check