Merge branch 'master' into refactor-seed

This commit is contained in:
Ulf Gebhardt 2023-07-12 00:32:57 +02:00 committed by GitHub
commit d0fe6273b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 13 deletions

View File

@ -23,7 +23,7 @@ jobs:
prepare:
name: Prepare
if: needs.files-changed.outputs.webapp
if: needs.files-changed.outputs.webapp == 'true'
needs: files-changed
runs-on: ubuntu-latest
steps:
@ -37,7 +37,7 @@ jobs:
build_test_webapp:
name: Docker Build Test - Webapp
if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp
if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
needs: [files-changed, prepare]
runs-on: ubuntu-latest
steps:
@ -57,7 +57,7 @@ jobs:
lint_webapp:
name: Lint Webapp
if: needs.files-changed.outputs.webapp
if: needs.files-changed.outputs.webapp == 'true'
needs: files-changed
runs-on: ubuntu-latest
steps:
@ -69,7 +69,7 @@ jobs:
unit_test_webapp:
name: Unit Tests - Webapp
if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp
if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
needs: [files-changed, build_test_webapp]
runs-on: ubuntu-latest
permissions:

View File

@ -42,10 +42,7 @@ module.exports = defineConfig({
baseUrl: "http://localhost:3000",
specPattern: "cypress/e2e/**/*.feature",
supportFile: "cypress/support/e2e.js",
retries: {
runMode: 2,
openMode: 0,
},
retries: 0,
video: false,
setupNodeEvents,
},

View File

@ -580,7 +580,7 @@
"moreInfo": "Was ist {APPLICATION_NAME}?",
"moreInfoHint": "zur Präsentationsseite",
"no-account": "Du hast noch kein Nutzerkonto?",
"no-cookie": "Es kann kein Cookie angelegt werden. Du must Cookies akzeptieren.",
"no-cookie": "Es kann kein Cookie angelegt werden. Du musst Cookies akzeptieren.",
"password": "Dein Passwort",
"register": "Nutzerkonto erstellen",
"success": "Du bist eingeloggt!"
@ -759,9 +759,9 @@
"viewEvent": {
"eventEnd": "Ende",
"eventIsOnline": "Online",
"eventLocationName": "Stadt",
"eventLocationName": "Stadt - z.B. Musterstraße 1, 12345 Musterstadt",
"eventStart": "Beginn",
"eventVenue": "Veranstaltungsort",
"eventVenue": "Veranstaltungsort - z.B. Hinterhof, 1. OG, ...",
"title": "Veranstaltung"
},
"viewPost": {

View File

@ -759,9 +759,9 @@
"viewEvent": {
"eventEnd": "End",
"eventIsOnline": "Online",
"eventLocationName": "City",
"eventLocationName": "City - e.g. Example street 1, 12345 City",
"eventStart": "Start",
"eventVenue": "Venue",
"eventVenue": "Venue - e.g. Backyard, 1st Floor, ...",
"title": "Event"
},
"viewPost": {