Skip to content

Commit

Permalink
Merge branch 'develop' into feature/PTDL-3503
Browse files Browse the repository at this point in the history
  • Loading branch information
mrxbox98 authored Oct 22, 2022
2 parents 3845d94 + 860b2d8 commit 0baf237
Show file tree
Hide file tree
Showing 5 changed files with 178 additions and 146 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
uses: docker/build-push-action@v2
if: "contains(github.ref, 'release/v')"
with:
context: .
file: ./Dockerfile
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.docker_meta.outputs.tags }}
Expand All @@ -49,7 +51,11 @@ jobs:
uses: docker/build-push-action@v2
if: "contains(github.ref, 'develop')"
with:
context: .
file: ./Dockerfile
push: ${{ github.event_name != 'pull_request' }}
platforms: linux/amd64,linux/arm64
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@ This file is a running track of new features and fixes to each version of the pa

This project follows [Semantic Versioning](http://semver.org) guidelines.

## [Unreleased]
### Changed
* Changed minimum PHP version is now 8.0 instead of `7.4`.
* Upgraded from Laravel 8 to Laravel 9.

## v1.10.4
### Fixed
* Fixed an issue where subusers could be given permissions that are not actually registered or used.
* Fixed an issue where node FQDNs could not just be IP addresses.

### Changed
* Change maximum number of API keys per user from `10` to `25`.
* Change byte unit prefix from `B` to `iB` to better reflect our usage of base 2 (multiples of 1024).

## v1.10.3
### Fixed
* S3 Backup driver now supports Cloudflare R2.
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/Overrides/UpCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ public function handle(): int
return 1;
}

return parent::handle();
return parent::handle() ?? 0;
}
}
Loading

0 comments on commit 0baf237

Please sign in to comment.