From bb3280a9204757600e29e1c9c722dd57b12b4393 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Tue, 1 Oct 2024 19:21:06 -0400
Subject: [PATCH 1/2] Revert "Make copies of the auth templates for Rails 8
 beta1"

This reverts commit 9dee33a64db4323414bab5910f379b38fb8b0d47.
---
 .../templates/views/passwords/edit.html.erb   | 21 -------------
 .../templates/views/passwords/new.html.erb    | 17 ----------
 .../templates/views/sessions/new.html.erb     | 31 -------------------
 3 files changed, 69 deletions(-)
 delete mode 100644 lib/generators/tailwindcss/authentication/templates/views/passwords/edit.html.erb
 delete mode 100644 lib/generators/tailwindcss/authentication/templates/views/passwords/new.html.erb
 delete mode 100644 lib/generators/tailwindcss/authentication/templates/views/sessions/new.html.erb

diff --git a/lib/generators/tailwindcss/authentication/templates/views/passwords/edit.html.erb b/lib/generators/tailwindcss/authentication/templates/views/passwords/edit.html.erb
deleted file mode 100644
index 939b0b8d..00000000
--- a/lib/generators/tailwindcss/authentication/templates/views/passwords/edit.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="mx-auto md:w-2/3 w-full">
-  <%% if alert = flash[:alert] %>
-    <p class="py-2 px-3 bg-red-50 mb-5 text-red-500 font-medium rounded-lg inline-block" id="alert"><%%= alert %></p>
-  <%% end %>
-
-  <h1 class="font-bold text-4xl">Update your password</h1>
-
-  <%%= form_with url: password_path(params[:token]), method: :put, class: "contents" do |form| %>
-    <div class="my-5">
-      <%%= form.password_field :password, required: true, autocomplete: "new-password", placeholder: "Enter new password", maxlength: 72, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
-    </div>
-
-    <div class="my-5">
-      <%%= form.password_field :password_confirmation, required: true, autocomplete: "new-password", placeholder: "Repeat new password", maxlength: 72, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
-    </div>
-
-    <div class="inline">
-      <%%= form.submit "Save", class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
-    </div>
-  <%% end %>
-</div>
diff --git a/lib/generators/tailwindcss/authentication/templates/views/passwords/new.html.erb b/lib/generators/tailwindcss/authentication/templates/views/passwords/new.html.erb
deleted file mode 100644
index e5d88197..00000000
--- a/lib/generators/tailwindcss/authentication/templates/views/passwords/new.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="mx-auto md:w-2/3 w-full">
-  <%% if alert = flash[:alert] %>
-    <p class="py-2 px-3 bg-red-50 mb-5 text-red-500 font-medium rounded-lg inline-block" id="alert"><%%= alert %></p>
-  <%% end %>
-
-  <h1 class="font-bold text-4xl">Forgot your password?</h1>
-
-  <%%= form_with url: passwords_path, class: "contents" do |form| %>
-    <div class="my-5">
-      <%%= form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", placeholder: "Enter your email address", value: params[:email_address], class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
-    </div>
-
-    <div class="inline">
-      <%%= form.submit "Email reset instructions", class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
-    </div>
-  <%% end %>
-</div>
diff --git a/lib/generators/tailwindcss/authentication/templates/views/sessions/new.html.erb b/lib/generators/tailwindcss/authentication/templates/views/sessions/new.html.erb
deleted file mode 100644
index a4751541..00000000
--- a/lib/generators/tailwindcss/authentication/templates/views/sessions/new.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="mx-auto md:w-2/3 w-full">
-  <%% if alert = flash[:alert] %>
-    <p class="py-2 px-3 bg-red-50 mb-5 text-red-500 font-medium rounded-lg inline-block" id="alert"><%%= alert %></p>
-  <%% end %>
-
-  <%% if notice = flash[:notice] %>
-    <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-lg inline-block" id="notice"><%%= notice %></p>
-  <%% end %>
-
-  <h1 class="font-bold text-4xl">Sign in</h1>
-
-  <%%= form_with url: session_url, class: "contents" do |form| %>
-    <div class="my-5">
-      <%%= form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", placeholder: "Enter your email address", value: params[:email_address], class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
-    </div>
-
-    <div class="my-5">
-      <%%= form.password_field :password, required: true, autocomplete: "current-password", placeholder: "Enter your password", maxlength: 72, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
-    </div>
-
-    <div class="col-span-6 sm:flex sm:items-center sm:gap-4">
-      <div class="inline">
-        <%%= form.submit "Sign in", class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
-      </div>
-
-      <div class="mt-4 text-sm text-gray-500 sm:mt-0">
-        <%%= link_to "Forgot password?", new_password_path, class: "text-gray-700 underline" %>
-      </div>
-    </div>
-  <%% end %>
-</div>

From cfa33d9124c8add17ea3ba8a8783be798ae68c43 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Fri, 15 Nov 2024 10:35:30 -0500
Subject: [PATCH 2/2] ci: bump upstream matrix to include 8-0-stable

---
 .github/workflows/upstream.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index 17e02892..5c213e6e 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -41,7 +41,7 @@ jobs:
       fail-fast: false
       matrix:
         plat: ["ubuntu"]
-        ref: ["7-2-stable", "v8.0.0.beta1", "main"]
+        ref: ["7-2-stable", "8-0-stable", "main"]
         tailwind: ["--version=~>3.4.14", "--version=~>4.0.0.alpha.27"]
     env:
       RAILSOPTS: --git=https://github.com/rails/rails --ref=${{ matrix.ref }}