From c252650c9a04220ecbb6ff5faa862e07a4e023ea Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Mon, 29 Apr 2024 18:24:58 +0530 Subject: [PATCH 1/2] chore: project pages order by option improvement (#4307) --- web/constants/page.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/web/constants/page.ts b/web/constants/page.ts index 04b95c163b..f196b61523 100644 --- a/web/constants/page.ts +++ b/web/constants/page.ts @@ -23,7 +23,6 @@ export const PAGE_SORTING_KEY_OPTIONS: { { key: "name", label: "Name" }, { key: "created_at", label: "Date created" }, { key: "updated_at", label: "Date modified" }, - { key: "opened_at", label: "Last opened" }, ]; export const PAGE_SORT_BY_OPTIONS: { From 392075a9ebce67404cf0b683de8ef0ad42542211 Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Mon, 29 Apr 2024 18:33:09 +0530 Subject: [PATCH 2/2] fix: workflow fixes --- .github/workflows/auto-merge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 621a28eb67..bc3548ccf0 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -74,6 +74,8 @@ jobs: - name: Merge Change to Target Branch if: env.HAS_CONFLICTS == 'false' run: | + git config user.name "$ACCOUNT_USER_NAME" + git config user.email "$ACCOUNT_USER_EMAIL" git commit -m "Merge branch '$SOURCE_BRANCH' into $TARGET_BRANCH" git push origin $TARGET_BRANCH