Skip to content

Commit

Permalink
Merge branch 'main' into renovate/major-lint
Browse files Browse the repository at this point in the history
  • Loading branch information
shuuji3 authored Feb 3, 2025
2 parents a8e1286 + 835ed51 commit 8c23c9f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ WORKDIR /elk
FROM base AS builder

# Prepare pnpm https://pnpm.io/installation#using-corepack
RUN corepack enable
# workaround for npm registry key change
# ref. `[email protected]` / `[email protected]` cannot be installed due to key id mismatch · Issue #612 · nodejs/corepack
# - https://github.com/nodejs/corepack/issues/612#issuecomment-2629496091
RUN npm i -g corepack@latest && corepack enable

# Prepare deps
RUN apk update
Expand Down
2 changes: 1 addition & 1 deletion composables/masto/status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function useStatusActions(props: StatusActionsProps) {
if (isCancel && countField && prevCount === newStatus[countField])
newStatus[countField] -= 1

Object.assign(status, newStatus)
Object.assign(status.value, newStatus)
cacheStatus(newStatus, undefined, true)
}).finally(() => {
isLoading.value[action] = false
Expand Down

0 comments on commit 8c23c9f

Please sign in to comment.