Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v5.20.1 #1523

Merged
merged 24 commits into from
Jan 15, 2023
Merged

v5.20.1 #1523

merged 24 commits into from
Jan 15, 2023

Commits on Dec 13, 2022

  1. Add merge conflict workflow 

    Signed-off-by: Christian König <ckoenig@posteo.de>
    @yubiuser
    yubiuser committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    b2dadba View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2022

  1. Use github cli to sync master back to development 

    Signed-off-by: Christian König <ckoenig@posteo.de>
    @yubiuser
    yubiuser committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    bda6721 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2022

  1. Bump actions/checkout from 3.1.0 to 3.2.0 

    Bumps [actions/checkout](https://github.com/actions/checkout) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Dec 17, 2022
    Configuration menu
    Copy the full SHA
    6104752 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2022

  1. Merge pull request #1511 from pi-hole/master 

    sync: master to development
    @DL6ER
    DL6ER authored Dec 21, 2022
    Configuration menu
    Copy the full SHA
    d5b9518 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2022

  1. Be honest 

    Signed-off-by: Christian König <ckoenig@posteo.de>
    @yubiuser
    yubiuser committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    df399e3 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. Merge pull request #1504 from pi-hole/merge_conflict 

    Add merge conflict workflow
    @DL6ER
    DL6ER authored Dec 23, 2022
    Configuration menu
    Copy the full SHA
    5ffac1a View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2022

  1. Bump actions/stale from 6.0.1 to 7.0.0 

    Bumps [actions/stale](https://github.com/actions/stale) from 6.0.1 to 7.0.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](actions/stale@v6.0.1...v7.0.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    fbdb2e6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1513 from pi-hole/dependabot-github_actions-devel… 

    …opment-actions-stale-7.0.0

Bump actions/stale from 6.0.1 to 7.0.0
    @DL6ER
    DL6ER authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    4d4e10b View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2022

  1. Always store time we start to save to the database (not only in debug… 

    … mode). This avoids errorneous timing reports in case of errors.

Signed-off-by: DL6ER <dl6er@dl6er.de>
    @DL6ER
    DL6ER committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    f0b133b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1514 from pi-hole/fix/query_store_message 

    Always store time we start saving to the database
    @DL6ER
    DL6ER authored Dec 27, 2022
    Configuration menu
    Copy the full SHA
    928fe82 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1507 from pi-hole/dependabot-github_actions-devel… 

    …opment-actions-checkout-3.2.0

Bump actions/checkout from 3.1.0 to 3.2.0
    @DL6ER
    DL6ER authored Dec 27, 2022
    Configuration menu
    Copy the full SHA
    80f8c63 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1506 from pi-hole/sync_back 

    Use github cli to sync master back to development
    @DL6ER
    DL6ER authored Dec 27, 2022
    Configuration menu
    Copy the full SHA
    af4378d View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2023

  1. Don't run the Transfer Builds to Pi-hole Server... step for dependa… 

    …bot PRs
    @PromoFaux
    PromoFaux committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    3a6f7e1 View commit details
    Browse the repository at this point in the history

  2. Bump actions/checkout from 3.2.0 to 3.3.0 

    Bumps [actions/checkout](https://github.com/actions/checkout) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3.2.0...v3.3.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @PromoFaux
    dependabot[bot] authored and PromoFaux committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    2f67c59 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1518 from pi-hole/dependabot-github_actions-devel… 

    …opment-actions-checkout-3.3.0

Bump actions/checkout from 3.2.0 to 3.3.0
    @PromoFaux
    PromoFaux authored Jan 7, 2023
    Configuration menu
    Copy the full SHA
    435a917 View commit details
    Browse the repository at this point in the history

  4. Don't run the Transfer Builds to Pi-hole Server... step for dependa… 

    …bot PRs
    @PromoFaux
    PromoFaux committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    ac969d8 View commit details
    Browse the repository at this point in the history

  5. Bump actions/upload-artifact from 3.1.1 to 3.1.2 

    Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v3.1.1...v3.1.2)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @PromoFaux
    dependabot[bot] authored and PromoFaux committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    9144f4b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1516 from pi-hole/dependabot-github_actions-devel… 

    …opment-actions-upload-artifact-3.1.2

Bump actions/upload-artifact from 3.1.1 to 3.1.2
    @PromoFaux
    PromoFaux authored Jan 7, 2023
    Configuration menu
    Copy the full SHA
    348a864 View commit details
    Browse the repository at this point in the history

  7. Bump actions/download-artifact from 3.0.1 to 3.0.2 

    Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Jan 7, 2023
    Configuration menu
    Copy the full SHA
    031c137 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1517 from pi-hole/dependabot-github_actions-devel… 

    …opment-actions-download-artifact-3.0.2

Bump actions/download-artifact from 3.0.1 to 3.0.2
    @PromoFaux
    PromoFaux authored Jan 7, 2023
    Configuration menu
    Copy the full SHA
    d4ea54b View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. Remove gray color in help output 

    Signed-off-by: Christian König <ckoenig@posteo.de>
    @yubiuser
    yubiuser committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    6bb3927 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Merge pull request #1520 from pi-hole/colors 

    Remove gray color in help output
    @DL6ER
    DL6ER authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    c4f38c7 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2023

  1. Bump benoitchantre/setup-ssh-authentication-action from 1.0.0 to 1.0.1 

    Bumps [benoitchantre/setup-ssh-authentication-action](https://github.com/benoitchantre/setup-ssh-authentication-action) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/benoitchantre/setup-ssh-authentication-action/releases)
- [Changelog](https://github.com/benoitchantre/setup-ssh-authentication-action/blob/main/CHANGELOG.md)
- [Commits](benoitchantre/setup-ssh-authentication-action@1.0.0...1.0.1)

---
updated-dependencies:
- dependency-name: benoitchantre/setup-ssh-authentication-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Jan 14, 2023
    Configuration menu
    Copy the full SHA
    6333d4c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1521 from pi-hole/dependabot-github_actions-devel… 

    …opment-benoitchantre-setup-ssh-authentication-action-1.0.1

Bump benoitchantre/setup-ssh-authentication-action from 1.0.0 to 1.0.1
    @DL6ER
    DL6ER authored Jan 14, 2023
    Configuration menu
    Copy the full SHA
    4e0face View commit details
    Browse the repository at this point in the history