diff --git a/.drone.yml b/.drone.yml index 246c917..b6d8c82 100644 --- a/.drone.yml +++ b/.drone.yml @@ -172,7 +172,7 @@ steps: DOCKER_USER: from_secret: docker_username PUSHRM_FILE: README.md - PUSHRM_SHORT: Drone plugin to build multiarch Docker images with buildx + PUSHRM_SHORT: Drone plugin to provision via Ansible PUSHRM_TARGET: owncloudci/${DRONE_REPO_NAME} when: status: diff --git a/.github/settings.yml b/.github/settings.yml index df310fa..6f49363 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -14,8 +14,8 @@ repository: default_branch: main allow_squash_merge: true - allow_merge_commit: true - allow_rebase_merge: true + allow_merge_commit: false + allow_rebase_merge: false labels: - name: bug @@ -48,7 +48,7 @@ labels: teams: - name: bot - permission: admin + permission: write branches: - name: main