From 9fd078c59ddaa510369652046ad7cb6d33f9ac95 Mon Sep 17 00:00:00 2001
From: Bailey Pumfleet <pumfleet@hey.com>
Date: Mon, 15 Nov 2021 18:47:20 +0000
Subject: [PATCH] Revert "automerge and approve crowdin (#1167)" (#1174)

---
 .github/workflows/crowdin.yml | 23 +++++++++++------------
 .kodiak.toml                  |  5 +----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
index 3c29df1586..944daf4498 100644
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -10,17 +10,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
 
-      - name: crowdin action
-        uses: crowdin/github-action@1.4.0
-        with:
-          upload_translations: true
-          download_translations: true
-          pull_request_labels: "i18n, ♻️ autoupdate"
+    - name: Checkout
+      uses: actions/checkout@v2
 
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+    - name: crowdin action
+      uses: crowdin/github-action@1.4.0
+      with:
+        upload_translations: true
+        download_translations: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+        CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
diff --git a/.kodiak.toml b/.kodiak.toml
index 9aacbb76b5..34469c1bf1 100644
--- a/.kodiak.toml
+++ b/.kodiak.toml
@@ -4,8 +4,5 @@ version = 1
 autoupdate_label = "♻️ autoupdate"
 
 [approve]
-auto_approve_usernames = ["dependabot", "PeerRich", "baileypumfleet", "github-actions"]
+auto_approve_usernames = ["dependabot", "PeerRich", "baileypumfleet"]
 
-[merge]
-method = "squash"
-automerge_label = ["i18n"]