MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add-select-states-to-dropdown-data-provider-select

This commit is contained in:
Martin McKeaveney 2023-11-02 14:21:27 +00:00 committed by GitHub
parent babc40ab95 52510c5e48
commit 99c48af470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosting/single/Dockerfile.v2
View File

@ -120,7 +120,7 @@ VOLUME /data
ARG BUDIBASE_VERSION ARG BUDIBASE_VERSION
# Ensuring the version argument is sent # Ensuring the version argument is sent
RUN test -n "$BUDIBASE_VERSION" RUN test -n "$BUDIBASE_VERSION"
ENV BUDIBASE_VERSION=$BUDIBASE_VERSION ENV BUDIBASE_VERSION $BUDIBASE_VERSION
HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh" HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh"

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.12.4", "version": "2.12.5",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

10
pull_request_template.md
View File

@ -1,18 +1,16 @@
## Description ## Description
_Describe the problem or feature in addition to a link to the relevant github issues._ _Describe the problem or feature in addition to a link to the relevant github issues._
Addresses: Addresses:
- `<Enter the Link to the issue(s) this PR addresses>` - `<Enter the Link to the issue(s) this PR addresses>`
- ...more if required - ...more if required
## App Export ## App Export
- If possible, attach an app export file along with your request template to make QA testing easier, with minimal setup. - If possible, attach an app export file along with your request template to make QA testing easier, with minimal setup.
## Screenshots ## Screenshots
_If a UI facing feature, a short video of the happy path, and some screenshots of the new functionality._ _If a UI facing feature, a short video of the happy path, and some screenshots of the new functionality._
## Documentation
- [ ] I have reviewed the budibase documentatation to verify if this feature requires any changes. If changes or new docs are required I have written them.