From a2443156d2db1a3ba0094733680898bc0b7df722 Mon Sep 17 00:00:00 2001
From: Judeeeee <43412616+Judeeeee@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:37:27 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A6=8B=E5=87=BA=E3=81=97=E6=96=87?=
 =?UTF-8?q?=E8=A8=80=E3=81=AE=E5=A4=89=E6=9B=B4=E3=81=A8=E3=82=B3=E3=83=B3?=
 =?UTF-8?q?=E3=83=95=E3=83=AA=E3=82=AF=E3=83=88=E3=81=AE=E8=A7=A3=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

コンフリクトしたPR: https://github.com/fjordllc/bootcamp/pull/7930
https://github.com/fjordllc/bootcamp/issues/7894
---
 app/views/works/index.html.slim | 2 +-
 test/system/works_test.rb       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/works/index.html.slim b/app/views/works/index.html.slim
index de1c2c8b9d3..c0a7926d9bf 100644
--- a/app/views/works/index.html.slim
+++ b/app/views/works/index.html.slim
@@ -6,7 +6,7 @@ header.page-header
     .page-header__inner
       .page-header__start
         h2.page-header__title
-          = title
+          |みんなのポートフォリオ
       .page-header__end
         .page-header-actions
           ul.page-header-actions__items
diff --git a/test/system/works_test.rb b/test/system/works_test.rb
index 2a6ec0559bc..9fead42b900 100644
--- a/test/system/works_test.rb
+++ b/test/system/works_test.rb
@@ -7,6 +7,7 @@ class WorksTest < ApplicationSystemTestCase
     visit_with_auth portfolios_path, 'kimura'
     assert_equal 'みんなのポートフォリオ | FBC', title
     assert_selector "meta[property='og:title'][content='みんなのポートフォリオ']", visible: false
+    assert_selector 'h2.page-header__title', text: 'みんなのポートフォリオ'
     assert_text works(:work1).title
   end
 

From e214316e94acfd76e0774ff96ebb669455979934 Mon Sep 17 00:00:00 2001
From: Judeeeee <43412616+Judeeeee@users.noreply.github.com>
Date: Tue, 16 Jul 2024 22:35:28 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A8=E4=BD=93=E3=81=AE=E8=A1=A8?=
 =?UTF-8?q?=E8=A8=98=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/works/index.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/works/index.html.slim b/app/views/works/index.html.slim
index c0a7926d9bf..7a1fd23d537 100644
--- a/app/views/works/index.html.slim
+++ b/app/views/works/index.html.slim
@@ -6,7 +6,7 @@ header.page-header
     .page-header__inner
       .page-header__start
         h2.page-header__title
-          |みんなのポートフォリオ
+          | みんなのポートフォリオ
       .page-header__end
         .page-header-actions
           ul.page-header-actions__items