Skip to content

Commit

Permalink
Merge pull request #4759 from ecamp/devel
Browse files Browse the repository at this point in the history
Deploy fix for introduced bug to staging
  • Loading branch information
pmattmann authored Mar 12, 2024
2 parents 092744a + 2910a40 commit c2d602f
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reusable-dev-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
name: ${{ inputs.env }}
steps:
- name: Get link to currently running job logs
uses: Tiryoh/gha-jobid-action@v1.1.0
uses: Tiryoh/gha-jobid-action@v1.2.0
id: job-url
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"phpdocumentor/reflection-docblock": "5.3.0",
"phpmyadmin/sql-parser": "5.9.0",
"ramsey/uuid": "4.7.5",
"rize/uri-template": "0.3.5",
"rize/uri-template": "0.3.6",
"sentry/sentry-symfony": "4.14.0",
"stof/doctrine-extensions-bundle": "1.11.0",
"swaggest/json-schema": "0.12.42",
Expand All @@ -45,15 +45,15 @@
"symfony/yaml": "7.0.3",
"twig/cssinliner-extra": "^3.4",
"twig/extra-bundle": "^3.4",
"webonyx/graphql-php": "15.9.1"
"webonyx/graphql-php": "15.11.1"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "3.49.0",
"hautelook/alice-bundle": "2.13.0",
"justinrainbow/json-schema": "5.2.13",
"php-coveralls/php-coveralls": "2.7.0",
"phpstan/phpstan": "1.10.59",
"phpunit/phpunit": "10.5.11",
"phpunit/phpunit": "10.5.12",
"rector/rector": "0.19.8",
"spatie/phpunit-snapshot-assertions": "5.1.5",
"symfony/browser-kit": "7.0.3",
Expand Down
46 changes: 23 additions & 23 deletions api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-vue": "9.22.0",
"eslint-plugin-vue": "9.23.0",
"flush-promises": "1.0.2",
"jest-serializer-vue-tjw": "3.20.0",
"jsdom": "24.0.0",
"lint-staged": "15.2.2",
"prettier": "3.2.5",
"sass": "1.32.13",
"unplugin-vue-components": "0.26.0",
"vite": "5.1.5",
"vite": "5.1.6",
"vite-plugin-comlink": "4.0.2",
"vite-plugin-vue2-svg": "0.4.0",
"vitest": "1.3.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/print/config/PicassoConfig.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default {
config.options.periods = config.options.periods.filter((period) => {
return knownPeriods.includes(period)
})
if (!(config.options.orientation in ORIENTATIONS.map((o) => o.value))) {
if (!ORIENTATIONS.map((o) => o.value).includes(config.options.orientation)) {
config.options.orientation = 'L'
}
return config
Expand Down
16 changes: 8 additions & 8 deletions pdf/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pdf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
"dayjs": "1.11.10",
"eslint": "8.57.0",
"eslint-plugin-local-rules": "2.0.1",
"eslint-plugin-vue": "9.22.0",
"eslint-plugin-vue": "9.23.0",
"jsdom": "24.0.0",
"prettier": "3.2.5",
"url-template": "3.1.1",
"vite": "5.1.5",
"vite": "5.1.6",
"vitest": "1.3.1"
},
"eslintConfig": {
Expand Down
8 changes: 4 additions & 4 deletions print/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion print/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"eslint-config-prettier": "9.1.0",
"eslint-plugin-local-rules": "2.0.1",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-vue": "9.22.0",
"eslint-plugin-vue": "9.23.0",
"nuxt": "3.10.3",
"prettier": "3.2.5",
"sass": "1.69.4",
Expand Down

0 comments on commit c2d602f

Please sign in to comment.