mirror of
https://github.com/makeplane/plane.git
synced 2026-02-24 04:00:14 +01:00
Merge branch 'sync/ce-ee' into develop
This commit is contained in:
2
.github/workflows/auto-merge.yml
vendored
2
.github/workflows/auto-merge.yml
vendored
@@ -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
|
||||
|
||||
|
||||
@@ -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: {
|
||||
|
||||
Reference in New Issue
Block a user