Skip to content

Commit dc90eef

Browse files
matusdrobuliak66matusdrobuliak66
authored
Merge branch 'master' into preparation-for-osparc-io-migration
2 parents a2cb4d5 + eee1de2 commit dc90eef

File tree

127 files changed

+2172
-1423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+2172
-1423
lines changed

‎.eslintignore‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎eslint.config.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
ignores: [
3+
"services/static-webserver/client/source/resource/",
4+
"services/static-webserver/client/source-output/",
5+
]
6+
};

‎packages/models-library/src/models_library/api_schemas_dynamic_sidecar/containers.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ class ActivityInfo(BaseModel):
1616

1717

1818
ActivityInfoOrNone: TypeAlias = ActivityInfo | None
19+
20+
DockerComposeYamlStr: TypeAlias = str

0 commit comments

Comments
 (0)