From b2cba04639db4ca0ff140379dd0a8c776d9358a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Sun, 27 Jun 2021 19:53:54 +0200
Subject: [PATCH 1/2] Create command-rebase.yml

---
 .github/workflows/command-rebase.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/command-rebase.yml

diff --git a/.github/workflows/command-rebase.yml b/.github/workflows/command-rebase.yml
new file mode 100644
index 000000000..1eea580d3
--- /dev/null
+++ b/.github/workflows/command-rebase.yml
@@ -0,0 +1,27 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+on:
+  issue_comment:
+    types: [ created ]
+name: Automatic Rebase
+
+jobs:
+  rebase:
+    name: Rebase
+    # On pull requests and if the comment starts with `/rebase`
+    if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      
+      - name: Automatic Rebase
+        uses: cirrus-actions/rebase@1.5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 158073bc59877f2e1ece3496836e57d887580c70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Sun, 27 Jun 2021 19:54:19 +0200
Subject: [PATCH 2/2] Delete rebase.yml

---
 .github/workflows/rebase.yml | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 .github/workflows/rebase.yml

diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
deleted file mode 100644
index c50856734..000000000
--- a/.github/workflows/rebase.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-on:
-    issue_comment:
-        types: [ created ]
-name: Automatic Rebase
-jobs:
-    rebase:
-        name: Rebase
-        if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
-        runs-on: ubuntu-latest
-        steps:
-            -   name: Checkout the latest code
-                uses: actions/checkout@v2
-                with:
-                    fetch-depth: 0
-            -   name: Automatic Rebase
-                uses: cirrus-actions/rebase@1.3.1
-                env:
-                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}