From c8f0d1413bc2e69efad76dbd174c077bc5751953 Mon Sep 17 00:00:00 2001
From: rinsuki <428rinsuki+git@gmail.com>
Date: Mon, 10 Aug 2020 01:32:27 +0900
Subject: [PATCH 1/2] Fix #6637 (#6638)

* Fix #6637

* fix lint
---
 src/server/api/endpoints/admin/show-user.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/api/endpoints/admin/show-user.ts b/src/server/api/endpoints/admin/show-user.ts
index 81a311b72..ea4df141f 100644
--- a/src/server/api/endpoints/admin/show-user.ts
+++ b/src/server/api/endpoints/admin/show-user.ts
@@ -35,5 +35,8 @@ export default define(meta, async (ps, me) => {
 		throw new Error('cannot show info of admin');
 	}
 
-	return user;
+	return {
+		...user,
+		token: user.token != null ? '<MASKED>' : user.token,
+	};
 });

From 0cdca54cf9a06c96f3733cc05e42feb3260e3ee4 Mon Sep 17 00:00:00 2001
From: rinsuki <428rinsuki+git@gmail.com>
Date: Mon, 10 Aug 2020 01:33:01 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Docker=E3=81=AE=E3=83=93=E3=83=AB=E3=83=89?=
 =?UTF-8?q?=E6=99=82=E3=81=ABgit=E3=82=92=E5=85=A5=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20(#6639)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/syuilo/misskey/commit/917d3d0bd3e7746b722f154860c604c4d6c92c69 でgitの依存関係が追加されたのにgitが入っていないのでコケていた
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 7b159efe0..9eb69e230 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ RUN apk add --no-cache \
     autoconf \
     automake \
     file \
+		git \
     g++ \
     gcc \
     libc-dev \