Dash fixed header redesign #1185
Annotations
1 error and 1 warning
i18n_check
**i18n-check**
<details>
<summary>Errors occurred when merging changes from your branch with the Weblate branch.</summary>
```
Rebasing (1/3)
Auto-merging jest/mocks/globals.mock.js
CONFLICT (add/add): Merge conflict in jest/mocks/globals.mock.js
Auto-merging package-lock.json
CONFLICT (add/add): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging src/i18n-keysets/dash.main.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.main.view/ru.json
Auto-merging src/shared/types/feature.ts
CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts
Auto-merging src/ui/components/DashKit/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/constants.ts
Auto-merging src/ui/components/DashKit/helpers.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/helpers.tsx
Auto-merging src/ui/libs/DatalensChartkit/Error/Error.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/Error/Error.tsx
Auto-merging src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
Auto-merging src/ui/libs/DatalensChartkit/modules/navigation.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/navigation.ts
Auto-merging src/ui/store/actions/openDialogTypes.ts
CONFLICT (add/add): Merge conflict in src/ui/store/actions/openDialogTypes.ts
Auto-merging src/ui/units/dash/containers/Body/Body.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Connections/Connections.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Connections/Connections.js
Auto-merging src/ui/units/dash/modules/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/helpers.ts
Auto-merging src/ui/units/dash/store/actions/base/actions.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/base/actions.ts
Auto-merging src/ui/units/dash/store/actions/dialogs/actions.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/dialogs/actions.ts
Auto-merging src/ui/units/dash/store/actions/relations/actions.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/relations/actions.ts
Auto-merging src/ui/units/dash/store/constants/dashActionTypes.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/constants/dashActionTypes.ts
Auto-merging src/ui/units/dash/store/reducers/dash.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dash.js
Auto-merging src/ui/units/dash/store/reducers/dashTypedReducer.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dashTypedReducer.ts
Auto-merging src/ui/utils/copyItems.ts
CONFLICT (add/add): Merge conflict in src/ui/utils/copyItems.ts
Auto-merging tests/opensource-suites/dash/base/loading.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/base/loading.test.ts
Auto-merging tests/opensource-suites/dash/base/relations.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/base/relations.test.ts
Auto-merging tests/opensource-suites/dash/relations/ignore.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/relations/ignore.test.ts
Auto-merging tests/opensource-suites/dash/relations/relations.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/relations/relations.test.ts
Auto-merging tests/opensource-suites/ql/visualizations/column/column.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/ql/visualizations/column/column.test.ts
Auto-merging tests/opensource-suites/ql/visualizations/pie/labels.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/ql/visualizations/pie/labels.test.ts
Auto-merging tests/opensource-suites/ql/visualizations/treemap/basic.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/ql/visualizations/treemap/basic.test.ts
Auto-merg
|
i18n_check
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|