diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4cd0e6e9e..6bd4358a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -274,7 +274,7 @@ package-app-dev: # Packaging app for multi-arch multi-arch-release: stage: package - image: docker:stable + image: docker:20.10.12 variables: DOCKER_TLS_CERTDIR: "/certs" DOCKER_HOST: tcp://docker:2376 @@ -283,7 +283,7 @@ multi-arch-release: DOCKER_DRIVER: overlay2 APP_ASSET: "${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_${ARCH}.tar.gz" services: - - docker:stable-dind + - docker:20.10.12-dind cache: {} before_script: # Install buildx diff --git a/.sobelow-conf b/.sobelow-conf index 8cd2246e6..56b7c740e 100644 --- a/.sobelow-conf +++ b/.sobelow-conf @@ -8,5 +8,5 @@ out: "", threshold: "medium", ignore: ["Config.HTTPS", "Config.CSP"], - ignore_files: ["config/dev.1.secret.exs", "config/dev.2.secret.exs", "config/dev.3.secret.exs", "config/dev.secret.exs", "config/e2e.secret.exs", "config/prod.secret.exs", "config/test.secret.exs", "config/runtime.1.secret.exs", "config/runtime.2.secret.exs", "config/runtime.3.secret.exs", "config/runtime.exs"] + ignore_files: ["config/runtime.exs"] ] diff --git a/.sobelow-skips b/.sobelow-skips index 0dda374a6..3eabeecae 100644 --- a/.sobelow-skips +++ b/.sobelow-skips @@ -1,12 +1,16 @@ -5048AE33D6269B15E21CF28C6F545AB6 - -752C0E897CA81ACD81F4BB215FA5F8E4 -23412CF16549E4E88366DC9DECF39071 -81C1F600C5809C7029EE32DE4818CD7D +02CE4963DFD1B0D6D5C567357CAFFE97 155A1FB53DE39EC8EFCFD7FB94EA823D -73B351E4CB3AF715AD450A085F5E6304 -BBACD7F0BACD4A6D3010C26604671692 -6D4D4A4821B93BCFAC9CDBB367B34C4B -5674F0D127852889ED0132DC2F442AAB -1600B7206E47F630D94AB54C360906F0 \ No newline at end of file +2262742E5C8944D5BF6698EC61F5DE50 +25BEE162A99754480967216281E9EF33 +2A6F71CD6F1246F0B152C2376E2E398A +30552A09D485A6AA73401C1D54F63C21 +52900CE4EE3598F6F178A651FB256770 +6151F44368FC19F2394274F513C29151 +765526195D4C6D770EAF4DC944A8CBF4 +B2FF1A12F13B873507C85091688C1D6D +B9AF8A342CD7FF39E10CC10A408C28E1 +C042E87389F7BDCFF4E076E95731AE69 +C42BFAEF7100F57BED75998B217C857A +D11958E86F1B6D37EF656B63405CA8A4 +F16F054F2628609A726B9FF2F089D484 \ No newline at end of file diff --git a/js/src/App.vue b/js/src/App.vue index d8a7cd4df..c67807e88 100644 --- a/js/src/App.vue +++ b/js/src/App.vue @@ -221,7 +221,7 @@ export default class App extends Vue { ? this.routerView?.$refs?.componentFocusTarget : this.routerView?.$el ) as HTMLElement; - if (focusTarget) { + if (focusTarget && focusTarget instanceof Element) { // Make focustarget programmatically focussable focusTarget.setAttribute("tabindex", "-1"); diff --git a/js/src/components/Resource/ResourceItem.vue b/js/src/components/Resource/ResourceItem.vue index 58b570768..fbac3cb9e 100644 --- a/js/src/components/Resource/ResourceItem.vue +++ b/js/src/components/Resource/ResourceItem.vue @@ -45,7 +45,7 @@
-

+

{{ $t('Move "{resourceName}"', { resourceName: initialResource.title }) }} @@ -28,7 +28,7 @@