diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bc802341d9..6b398d15cc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -183,7 +183,7 @@ jobs: runs-on: ubuntu-latest needs: [lint, unit_back, unit_front] name: '[EE] E2E (postgres, node: ${{ matrix.node }})' - if: github.event.pull_request.head.repo.full_name == github.repository + if: github.event.pull_request.head.repo.full_name == github.repository && !(github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') env: STRAPI_LICENSE: ${{ secrets.strapiLicense }} strategy: @@ -223,7 +223,7 @@ jobs: runs-on: ubuntu-latest needs: [lint, unit_back, unit_front] name: '[EE] E2E (mysql, node: ${{ matrix.node }})' - if: github.event.pull_request.head.repo.full_name == github.repository + if: github.event.pull_request.head.repo.full_name == github.repository && !(github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') env: STRAPI_LICENSE: ${{ secrets.strapiLicense }} strategy: @@ -262,7 +262,7 @@ jobs: runs-on: ubuntu-latest needs: [lint, unit_back, unit_front] name: '[EE] E2E (sqlite, node: ${{ matrix.node }})' - if: github.event.pull_request.head.repo.full_name == github.repository + if: github.event.pull_request.head.repo.full_name == github.repository && !(github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') env: STRAPI_LICENSE: ${{ secrets.strapiLicense }} strategy: @@ -284,7 +284,7 @@ jobs: runs-on: ubuntu-latest needs: [lint, unit_back, unit_front] name: '[EE] E2E (mongo, node: ${{ matrix.node }})' - if: github.event.pull_request.head.repo.full_name == github.repository + if: github.event.pull_request.head.repo.full_name == github.repository && !(github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') env: STRAPI_LICENSE: ${{ secrets.strapiLicense }} strategy: diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/ko.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/ko.json index cd01843fc5..f67d26b693 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/translations/ko.json +++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/ko.json @@ -47,7 +47,7 @@ "popUpWarning.bodyMessage.contentType.delete": "이 콘텐츠 타입을 삭제 하시겠습니까?", "relation.attributeName.placeholder": "Ex: author, category, tag", "relation.manyToMany": "N : N", - "relation.manyToOne": "N : 1", + "relation.manyToOne": "has many", "relation.manyWay": "has many", "relation.oneToMany": "1 : N", "relation.oneToOne": "1 : 1",