1. 04 Apr, 2022 2 commits
    • bors[bot]'s avatar
      Merge #2307 #2309 · 82d7fcd3
      bors[bot] authored
      2307: admin: graceful fail on user fetch in basic auth (backport #2299) r=mergify[bot] a=mergify[bot]
      
      This is an automatic backport of pull request #2299 done by [Mergify](https://mergify.com).
      
      
      ---
      
      
      <details>
      <summary>Mergify commands and options</summary>
      
      <br />
      
      More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
      
      You can also trigger Mergify actions by commenting on this pull request:
      
      - ``@Mergifyio` refresh` will re-evaluate the rules
      - ``@Mergifyio` rebase` will rebase this PR on its base branch
      - ``@Mergifyio` update` will merge the base branch into this PR
      - ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
      
      Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:
      
      - look at your merge queues
      - generate the Mergify configuration with the config editor.
      
      Finally, you can contact us on https://mergify.com
      </details>
      
      
      2309: Adding missing semicolon after remote_addr (backport #2305) r=mergify[bot] a=mergify[bot]
      
      This is an automatic backport of pull request #2305 done by [Mergify](https://mergify.com).
      
      
      ---
      
      
      <details>
      <summary>Mergify commands and options</summary>
      
      <br />
      
      More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
      
      You can also trigger Mergify actions by commenting on this pull request:
      
      - ``@Mergifyio` refresh` will re-evaluate the rules
      - ``@Mergifyio` rebase` will rebase this PR on its base branch
      - ``@Mergifyio` update` will merge the base branch into this PR
      - ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
      
      Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:
      
      - look at your merge queues
      - generate the Mergify configuration with the config editor.
      
      Finally, you can contact us on https://mergify.com
      
      
      </details>
      
      
      Co-authored-by: default avatarhitech95 <nicveronese@gmail.com>
      Co-authored-by: default avatarspomata <49432438+spomata@users.noreply.github.com>
      82d7fcd3
    • bors[bot]'s avatar
      Merge #2308 · 6122f053
      bors[bot] authored
      2308: Update alpine-linux to 3.14.5 - Zlib security FIX (backport #2302) r=mergify[bot] a=mergify[bot]
      
      This is an automatic backport of pull request #2302 done by [Mergify](https://mergify.com).
      Cherry-pick of a54a784168c023d1f95c2c1ba0cd97659ffbd08c has failed:
      ```
      On branch mergify/bp/1.9/pr-2302
      Your branch is up to date with 'origin/1.9'.
      
      You are currently cherry-picking commit a54a7841.
        (fix conflicts and run "git cherry-pick --continue")
        (use "git cherry-pick --skip" to skip this patch)
        (use "git cherry-pick --abort" to cancel the cherry-pick operation)
      
      Unmerged paths:
        (use "git add <file>..." to mark resolution)
      	both modified:   core/admin/Dockerfile
      	both modified:   core/dovecot/Dockerfile
      	both modified:   core/nginx/Dockerfile
      	both modified:   core/none/Dockerfile
      	both modified:   core/postfix/Dockerfile
      	both modified:   optional/clamav/Dockerfile
      	both modified:   optional/fetchmail/Dockerfile
      	both modified:   optional/radicale/Dockerfile
      	both modified:   optional/unbound/Dockerfile
      	both modified:   setup/Dockerfile
      
      no changes added to commit (use "git add" and/or "git commit -a")
      ```
      
      
      To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
      
      ---
      
      
      <details>
      <summary>Mergify commands and options</summary>
      
      <br />
      
      More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
      
      You can also trigger Mergify actions by commenting on this pull request:
      
      - ``@Mergifyio` refresh` will re-evaluate the rules
      - ``@Mergifyio` rebase` will rebase this PR on its base branch
      - ``@Mergifyio` update` will merge the base branch into this PR
      - ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
      
      Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:
      
      - look at your merge queues
      - generate the Mergify configuration with the config editor.
      
      Finally, you can contact us on https://mergify.com
      
      
      </details>
      
      
      Co-authored-by: default avatarWill <will@packer-output-c8fcfb40-3d93-4475-8f87-e14a9dd683b6>
      Co-authored-by: default avatarFlorent Daigniere <nextgens@users.noreply.github.com>
      6122f053
  2. 02 Apr, 2022 14 commits
  3. 22 Mar, 2022 4 commits
  4. 19 Mar, 2022 1 commit
    • bors[bot]'s avatar
      Merge #2288 · fad418df
      bors[bot] authored
      2288: Fixing AUTH_RATELIMIT_IP not working on imap/pop3/smtp (backport #2284) r=mergify[bot] a=mergify[bot]
      
      This is an automatic backport of pull request #2284 done by [Mergify](https://mergify.com).
      Cherry-pick of 64ad6931e993b5867ea5eec38d4ecd554d101a74 has failed:
      ```
      On branch mergify/bp/1.9/pr-2284
      Your branch is ahead of 'origin/1.9' by 3 commits.
        (use "git push" to publish your local commits)
      
      You are currently cherry-picking commit 64ad6931.
        (fix conflicts and run "git cherry-pick --continue")
        (use "git cherry-pick --skip" to skip this patch)
        (use "git cherry-pick --abort" to cancel the cherry-pick operation)
      
      Unmerged paths:
        (use "git add <file>..." to mark resolution)
      	both modified:   core/admin/mailu/internal/nginx.py
      
      no changes added to commit (use "git add" and/or "git commit -a")
      ```
      
      
      To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
      
      ---
      
      
      <details>
      <summary>Mergify commands and options</summary>
      
      <br />
      
      More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
      
      You can also trigger Mergify actions by commenting on this pull request:
      
      - ``@Mergifyio` refresh` will re-evaluate the rules
      - ``@Mergifyio` rebase` will rebase this PR on its base branch
      - ``@Mergifyio` update` will merge the base branch into this PR
      - ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
      
      Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:
      
      - look at your merge queues
      - generate the Mergify configuration with the config editor.
      
      Finally, you can contact us on https://mergify.com
      
      
      </details>
      
      
      Co-authored-by: default avatarMaximilian Fischer <github@maaeps.de>
      Co-authored-by: default avatarAlexander Graf <ghostwheel42@users.noreply.github.com>
      fad418df
  5. 18 Mar, 2022 6 commits
  6. 17 Mar, 2022 1 commit
  7. 24 Feb, 2022 5 commits
  8. 23 Feb, 2022 7 commits