From 1baa24905b96296e2bcd370b0e2398066f0fc663 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 30 Oct 2023 12:19:04 +0100 Subject: [PATCH] chore: only allow squash merge --- .drone.yml | 2 +- .github/settings.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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