Skip to content

Merge dev -> main#66

Merged
t-aleksander merged 7 commits into
mainfrom
dev
Jun 25, 2024
Merged

Merge dev -> main#66
t-aleksander merged 7 commits into
mainfrom
dev

Conversation

@t-aleksander
Copy link
Copy Markdown
Contributor

@t-aleksander t-aleksander commented Jun 25, 2024 •
edited
Loading

🛠️ Dev Branch Merge Checklist:

Documentation

  • If testing requires changes in the environment or deployment, please update the documentation (https://defguard.gitbook.io) first and attach the link to the documentation section in this pool request
  • I have commented on my code, particularly in hard-to-understand areas

Testing

  • I have prepared end-to-end tests for all new functionalities
  • I have performed end-to-end tests manually and they work
  • New and existing unit tests pass locally with my changes

Deployment

  • If deployment is affected I have made corresponding/required changes to deployment (Docker, Kubernetes, one-line install)

🏚️ Main Branch Merge Checklist:

Testing

  • I have merged my changes before to dev and the dev checklist is done
  • I have tested all functionalities on the dev instance and they work

Documentation

  • I have made corresponding changes to the user & admin documentation and added new features documentation with screenshots for users/admins

Adam and others added 7 commits May 10, 2024 17:22
feat: rate-limit proxy requests
5271e76
@t-aleksander
fix: add workaround for wrong config file extension on some browsers (#…
248e7c8 
…62)

* fix file extension on some browsers

* remove charset as it's unsued according to the standard
@t-aleksander
feat: properly interpret forbidden error codes (#63)
fcbc012 
* add permission denied error type

* change error text message
@t-aleksander
fix: update protobufs (#64)
29535cd
@t-aleksander
feat: add new logo (#65)
e7d998b 
* update logo

* fix names
@t-aleksander
ci: build DEB & RPM packages (#50)
272d746 
* add option to read config from file

* add base fpm config

* add systemd service config

* add DEB build workflow

* disable docker build for tests

* setup RPM build

* add link to docs

* fix comment

* embedd assets, make logs deserializable

* build frontend

* move binary to bin

* restart job

* add missing config value

* add remaining config values

* change dockerfile

* cleanup

* cleanup 2

* sort cargo toml

* add newlines

* Revert "sort cargo toml"

This reverts commit 40ddb29.

* preserve categories

* move get_config

---------

Co-authored-by: Maciej Wójcik <wojcik91@gmail.com>
Co-authored-by: Aleksander <170264518+t-aleksander@users.noreply.github.com>
@t-aleksander
chore: bump version 0.4 -> 0.5 (#67)
a07b0e4 
* bump version

* update lockfile
@t-aleksander t-aleksander marked this pull request as ready for review June 25, 2024 11:23
@t-aleksander t-aleksander merged commit da6a37c into main Jun 25, 2024
Copilot AI mentioned this pull request Apr 23, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@t-aleksander