diff --git a/.github/dependabot.yml b/.github/dependabot.yml index eaf714e1..ce7fd50f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,3 +21,46 @@ updates: target-branch: devel reviewers: - "pi-hole/web-maintainers" +- package-ecosystem: composer + directory: "/" + schedule: + interval: weekly + day: saturday + time: "10:00" + open-pull-requests-limit: 10 + target-branch: development-v6 + reviewers: + - "pi-hole/web-maintainers" + +# As above, but for development-v6 +- package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: saturday + time: "10:00" + open-pull-requests-limit: 10 + target-branch: development-v6 + versioning-strategy: increase + reviewers: + - "pi-hole/web-maintainers" +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: weekly + day: saturday + time: "10:00" + open-pull-requests-limit: 10 + target-branch: development-v6 + reviewers: + - "pi-hole/web-maintainers" +- package-ecosystem: composer + directory: "/" + schedule: + interval: weekly + day: saturday + time: "10:00" + open-pull-requests-limit: 10 + target-branch: development-v6 + reviewers: + - "pi-hole/web-maintainers" diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index cf8617c6..bc10f5fe 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -4,10 +4,14 @@ on: schedule: - cron: '0 8 * * *' workflow_dispatch: + issue_comment: + +env: + stale_label: stale jobs: - stale: - + stale_action: + if: github.event_name != 'issue_comment' runs-on: ubuntu-latest permissions: issues: write @@ -19,8 +23,26 @@ jobs: days-before-stale: 30 days-before-close: 5 stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Please comment or update this issue or it will be closed in 5 days.' - stale-issue-label: 'stale' + stale-issue-label: '${{ env.stale_label }}' exempt-issue-labels: 'internal, Fixed In Next Release, Bug, never-stale' exempt-all-issue-assignees: true operations-per-run: 300 close-issue-reason: 'not_planned' + + remove_stale: + # trigger "stale" removal immediately when stale issues are commented on + # we need to explicitly check that the trigger does not run on comment on a PR as + # 'issue_comment' triggers on issues AND PR comments + # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issue_comment-on-issues-only-or-pull-requests-only + if: ${{ !github.event.issue.pull_request && github.event_name != 'schedule' }} + permissions: + contents: read # for actions/checkout + issues: write # to edit issues label + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.1.7 + - name: Remove 'stale' label + run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package-lock.json b/package-lock.json index 83bc7eed..58d20bb8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3970,20 +3970,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/fullcalendar": { "version": "3.10.5", "resolved": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-3.10.5.tgz", diff --git a/style/pi-hole.css b/style/pi-hole.css index bc4a1a2e..7880e18e 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -794,29 +794,33 @@ li:not(.menu-open) .treeview-menu .warning-count { } /* Domains table: filter by type - smaller icheck */ -body:not(.lcars) .filter_types [class*="icheck-"] > label { +body:not([class*="lcars"]) .filter_types [class*="icheck-"] > label { padding-left: 1.5em !important; line-height: 1.2em; min-height: 1.2em; } -body:not(.lcars) +body:not([class*="lcars"]) .filter_types [class*="icheck-"] > input:first-child + input[type="hidden"] + label::before, -body:not(.lcars) .filter_types [class*="icheck-"] > input:first-child + label::before { +body:not([class*="lcars"]) .filter_types [class*="icheck-"] > input:first-child + label::before { width: 1.2em; height: 1.2em; margin-left: -1.55em; } -body:not(.lcars) +body:not([class*="lcars"]) .filter_types [class*="icheck-"] > input:first-child:checked + input[type="hidden"] + label::after, -body:not(.lcars) .filter_types [class*="icheck-"] > input:first-child:checked + label::after { +body:not([class*="lcars"]) + .filter_types + [class*="icheck-"] + > input:first-child:checked + + label::after { width: 0.35em; height: 0.7em; top: -0.2em;