From 34dffdfc8ffd20723bdf3eeb87c4254d8666bf5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Sat, 16 Feb 2019 11:10:06 +0900
Subject: [PATCH 1/2] Update config.yml

---
 .circleci/config.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc980f805..90688ee19 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -141,7 +141,14 @@ workflows:
                 - l10n_develop
                 - imgbot
                 - patch-autogen
+      - hold:
+          type: approval
+          filters:
+            branches:
+              ignore: master
       - build:
+          requires:
+            - hold
           filters:
             branches:
               ignore:

From b6c86e284584ba174bc80d29de019e4213582860 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 16 Feb 2019 16:27:24 +0900
Subject: [PATCH 2/2] Change home button to timeline (#4282)

* Home to Timeline

* remove home from locales
---
 locales/ja-JP.yml                                         | 2 +-
 src/client/app/desktop/views/components/ui.header.nav.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b540546ce..1de9654f6 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -61,6 +61,7 @@ common:
   drive: "ドライブ"
   messaging: "トーク"
   deck: "デッキ"
+  timeline: "タイムライン"
   explore: "みつける"
   following: "フォロー中"
   followers: "フォロワー"
@@ -1087,7 +1088,6 @@ desktop/views/components/ui.header.account.vue:
   dark: "闇に飲まれる"
 
 desktop/views/components/ui.header.nav.vue:
-  home: "ホーム"
   game: "ゲーム"
 
 desktop/views/components/ui.header.notifications.vue:
diff --git a/src/client/app/desktop/views/components/ui.header.nav.vue b/src/client/app/desktop/views/components/ui.header.nav.vue
index 612c8d931..3d4e34f91 100644
--- a/src/client/app/desktop/views/components/ui.header.nav.vue
+++ b/src/client/app/desktop/views/components/ui.header.nav.vue
@@ -1,8 +1,8 @@
 <template>
 <div class="nav">
 	<ul>
-		<li class="home active" @click="goToTop">
-			<router-link to="/"><fa icon="home"/><p>{{ $t('home') }}</p></router-link>
+		<li v-if="!$store.state.device.deckMode" class="timeline" @click="goToTop">
+			<router-link to="/"><fa icon="list"/><p>{{ $t('@.timeline') }}</p></router-link>
 		</li>
 		<li class="featured">
 			<router-link to="/featured"><fa :icon="faNewspaper"/><p>{{ $t('@.featured-notes') }}</p></router-link>