Skip to content

Commit

Permalink
Merge branch '4.2' into 4
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
GuySartorelli committed Jun 20, 2024
2 parents 1ecb8cd + b68d856 commit 4d14480
Show file tree
Hide file tree
Showing 5 changed files with 466 additions and 26 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/add-prs-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Add new PRs to github project

on:
pull_request_target:
types:
- opened
- ready_for_review

permissions: {}

jobs:
addprtoproject:
name: Add PR to GitHub Project
# Only run on the silverstripe account
if: github.repository_owner == 'silverstripe'
runs-on: ubuntu-latest
steps:
- name: Add PR to github project
uses: silverstripe/gha-add-pr-to-project@v1
with:
app_id: ${{ vars.PROJECT_PERMISSIONS_APP_ID }}
private_key: ${{ secrets.PROJECT_PERMISSIONS_APP_PRIVATE_KEY }}
1 change: 1 addition & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@silverstripe/eslint-config/.stylelintrc');
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"build": "yarn && yarn lint && rm -rf client/dist/* && NODE_ENV=production webpack --mode production --bail --progress",
"dev": "NODE_ENV=development webpack --progress",
"watch": "NODE_ENV=development webpack --watch --progress",
"lint": "sass-lint client/src/styles"
"lint": "stylelint client/src"
},
"dependencies": {},
"devDependencies": {
"@silverstripe/eslint-config": "^1.1.0",
"@silverstripe/eslint-config": "^1.3.0",
"@silverstripe/webpack-config": "^2.0.0",
"webpack": "^5.74.0",
"webpack-cli": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion src/Model/SitewideContentTaxonomy.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function updateColumns($itemType, &$columns)
}

// Check if pages has the tags field
if (!self::enabled()) {
if (!SitewideContentTaxonomy::enabled()) {
return;
}

Expand Down
Loading

0 comments on commit 4d14480

Please sign in to comment.