From 682da733da03489410f4cef5759184111f26bf77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Apr 2025 04:58:30 +0000
Subject: [PATCH 01/48] Bump nokogiri from 1.18.7 to 1.18.8

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.7 to 1.18.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.18.7...v1.18.8)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-version: 1.18.8
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 37b14083c..a9c459db0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -223,24 +223,24 @@ GEM
       net-protocol
     net-ssh (7.3.0)
     nio4r (2.7.4)
-    nokogiri (1.18.7)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.7-aarch64-linux-gnu)
+    nokogiri (1.18.8-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.7-aarch64-linux-musl)
+    nokogiri (1.18.8-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.7-arm-linux-gnu)
+    nokogiri (1.18.8-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.7-arm-linux-musl)
+    nokogiri (1.18.8-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.7-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-darwin)
+    nokogiri (1.18.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-linux-musl)
+    nokogiri (1.18.8-x86_64-linux-musl)
       racc (~> 1.4)
     ostruct (0.6.1)
     parallel (1.26.3)

From 58c7eb41bb47bb1ad4cc130fe6fb53f2cc146fda Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 09:55:59 +0200
Subject: [PATCH 02/48] AI slop for the honcho seed data

---
 db/seeds/honcho.rb | 74 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 10 deletions(-)

diff --git a/db/seeds/honcho.rb b/db/seeds/honcho.rb
index 918b3a4d5..9132177ab 100644
--- a/db/seeds/honcho.rb
+++ b/db/seeds/honcho.rb
@@ -3,19 +3,73 @@ create_tenant "honcho"
 david = create_first_run "David Heinemeier Hansson", "david@37signals.com"
 login_as david
 
-jz    = create_user "Jason Zimdars", "jz@37signals.com"
+jason = create_user "Jason Zimdars", "jz@37signals.com"
 kevin = create_user "Kevin Mcconnell", "kevin@37signals.com"
+sarah = create_user "Sarah Johnson", "sarah@37signals.com"
+mike = create_user "Mike Peterson", "mike@37signals.com"
 
-create_collection("Mucho", access_to: [ jz, kevin ]).tap do |fizzy|
-  create_card("Prepare MUCHO sign-up page", description: "We need to do this before the launch.", collection: fizzy)
+# Array of authors for random assignment
+authors = [david, jason, kevin, sarah, mike]
 
-  create_card("Prepare MUCHO sign-up page", description: "We need to do this before the launch.", collection: fizzy).tap do |card|
-    card.toggle_assignment(kevin)
-    card.engage
-  end
+# Card titles for reuse across collections
+card_titles = [
+  "Implement authentication",
+  "Design landing page",
+  "Set up database",
+  "Create API endpoints",
+  "Write unit tests",
+  "Optimize performance",
+  "Add user profiles",
+  "Implement search",
+  "Create admin panel",
+  "Set up CI/CD",
+  "Design logo",
+  "Create documentation",
+  "Add payment system",
+  "Implement notifications",
+  "Set up analytics",
+  "Create mobile layout",
+  "Add social sharing",
+  "Implement caching",
+  "Set up monitoring",
+  "Create error handling"
+]
 
-  create_card("Plain MUCHO text mentions", description: "We'll support plain text mentions first.", collection: fizzy).tap do |card|
-    card.toggle_assignment(david)
-    card.close
+# Create 10 collections
+collections = [
+  "Project Launch",
+  "Frontend Dev",
+  "Backend Dev",
+  "Design System",
+  "Testing Suite",
+  "Performance",
+  "User Experience",
+  "API Development",
+  "DevOps",
+  "Documentation"
+]
+
+collections.each_with_index do |collection_name, index|
+  create_collection(collection_name, access_to: authors.sample(3)).tap do |collection|
+    # Create 20 unique cards for each collection
+    card_titles.each do |title|
+      create_card(title,
+        description: "#{title} for #{collection_name} phase #{index + 1}.",
+        collection: collection
+      ).tap do |card|
+        # Randomly assign to 1-2 authors
+        card.toggle_assignment(authors.sample)
+        card.toggle_assignment(authors.sample) if rand > 0.5
+ 
+        # Randomly set card state
+        case rand(3)
+        when 0
+          card.engage
+        when 1
+          card.close
+        # 2 remains open
+        end
+      end
+    end
   end
 end

From 9b9acf36ae22b357f0977ddeabb4f6e946640905 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 11:21:09 +0200
Subject: [PATCH 03/48] Events track due_date changes in particulars, not as a
 direct attribute

---
 ...50422091602_remove_due_date_from_events.rb |  5 ++
 db/schema.rb                                  |  3 +-
 db/schema_cache.yml                           | 54 ++++++++-----------
 3 files changed, 28 insertions(+), 34 deletions(-)
 create mode 100644 db/migrate/20250422091602_remove_due_date_from_events.rb

diff --git a/db/migrate/20250422091602_remove_due_date_from_events.rb b/db/migrate/20250422091602_remove_due_date_from_events.rb
new file mode 100644
index 000000000..5a636e3dd
--- /dev/null
+++ b/db/migrate/20250422091602_remove_due_date_from_events.rb
@@ -0,0 +1,5 @@
+class RemoveDueDateFromEvents < ActiveRecord::Migration[8.1]
+  def change
+    remove_column :events, :due_date
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3a56a34ae..e1bea16a2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_04_18_150259) do
+ActiveRecord::Schema[8.1].define(version: 2025_04_22_091602) do
   create_table "accesses", force: :cascade do |t|
     t.integer "collection_id", null: false
     t.datetime "created_at", null: false
@@ -180,7 +180,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_18_150259) do
     t.integer "card_id", null: false
     t.datetime "created_at", null: false
     t.integer "creator_id", null: false
-    t.date "due_date"
     t.json "particulars", default: {}
     t.integer "summary_id", null: false
     t.datetime "updated_at", null: false
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 8152c393d..5d78e6883 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -80,7 +80,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &26 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: user_id
     cast_type: *1
@@ -389,12 +389,12 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: due_on
-    cast_type: &24 !ruby/object:ActiveRecord::Type::Date
+    cast_type: !ruby/object:ActiveRecord::Type::Date
       precision:
       scale:
       limit:
       timezone:
-    sql_type_metadata: &25 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: date
       type: :date
       limit:
@@ -435,7 +435,7 @@ columns:
     default_function:
     collation:
     comment:
-  - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: title
     cast_type: *7
@@ -490,11 +490,11 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: all_access
-    cast_type: &31 !ruby/object:ActiveModel::Type::Boolean
+    cast_type: &29 !ruby/object:ActiveModel::Type::Boolean
       precision:
       scale:
       limit:
-    sql_type_metadata: &32 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &30 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: boolean
       type: :boolean
       limit:
@@ -549,24 +549,14 @@ columns:
   - *21
   - *6
   - *23
-  - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
-    auto_increment:
-    name: due_date
-    cast_type: *24
-    sql_type_metadata: *25
-    'null': true
-    default:
-    default_function:
-    collation:
-    comment:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: particulars
-    cast_type: &26 !ruby/object:ActiveRecord::Type::Json
+    cast_type: &24 !ruby/object:ActiveRecord::Type::Json
       precision:
       scale:
       limit:
-    sql_type_metadata: &27 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+    sql_type_metadata: &25 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
       sql_type: json
       type: :json
       limit:
@@ -595,8 +585,8 @@ columns:
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: fields
-    cast_type: *26
-    sql_type_metadata: *27
+    cast_type: *24
+    sql_type_metadata: *25
     'null': false
     default: "{}"
     default_function:
@@ -627,7 +617,7 @@ columns:
     comment:
   filters_tags:
   - *18
-  - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+  - &27 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: tag_id
     cast_type: *1
@@ -707,13 +697,13 @@ columns:
     collation:
     comment:
   - *9
-  - *28
+  - *26
   pins:
   - *5
   - *21
   - *6
   - *9
-  - *28
+  - *26
   reactions:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -793,25 +783,25 @@ columns:
     default_function:
     collation:
     comment:
-  - *28
+  - *26
   taggings:
   - *5
   - *21
   - *6
-  - *29
+  - *27
   - *9
   tags:
   - *5
   - *6
-  - *30
+  - *28
   - *9
   users:
   - *5
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: active
-    cast_type: *31
-    sql_type_metadata: *32
+    cast_type: *29
+    sql_type_metadata: *30
     'null': false
     default: true
     default_function:
@@ -855,12 +845,12 @@ columns:
   - *21
   - *6
   - *9
-  - *28
+  - *26
   - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
     auto_increment:
     name: watching
-    cast_type: *31
-    sql_type_metadata: *32
+    cast_type: *29
+    sql_type_metadata: *30
     'null': false
     default: true
     default_function:
@@ -1938,4 +1928,4 @@ indexes:
     comment:
     valid: true
   workflows: []
-version: 20250418150259
+version: 20250422091602

From 2d5901fe1e44fdd4ad7f992490d23da927620b8b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 11:48:19 +0200
Subject: [PATCH 04/48] Fix pin turbo stream response rendering

---
 app/controllers/cards/pins_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/cards/pins_controller.rb b/app/controllers/cards/pins_controller.rb
index a4b49433f..6ac118543 100644
--- a/app/controllers/cards/pins_controller.rb
+++ b/app/controllers/cards/pins_controller.rb
@@ -28,6 +28,6 @@ class Cards::PinsController < ApplicationController
     end
 
     def render_pin_button_replacement
-      turbo_stream.replace [ @card, :pin_button ], partial: "cards/pins/pin_button", locals: { card: @card }
+      render turbo_stream: turbo_stream.replace([ @card, :pin_button ], partial: "cards/pins/pin_button", locals: { card: @card })
     end
 end

From 268e367c6f2ecf146b87f310e59ce0ba0acec367 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 11:53:16 +0200
Subject: [PATCH 05/48] Unused

---
 app/models/colorable.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/colorable.rb b/app/models/colorable.rb
index 4fba4556d..e774fd946 100644
--- a/app/models/colorable.rb
+++ b/app/models/colorable.rb
@@ -3,8 +3,4 @@ module Colorable
 
   COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ]
   DEFAULT_COLOR = "#2c6da8"
-
-  included do
-    attribute :color, default: DEFAULT_COLOR
-  end
 end

From 22abf0ba46c6b294258c3dacc6318a0651e0031d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 11:56:41 +0200
Subject: [PATCH 06/48] Remove anemic concern

Colors are a card concern.
---
 app/helpers/workflows_helper.rb            | 2 +-
 app/models/card/colored.rb                 | 5 ++++-
 app/models/colorable.rb                    | 6 ------
 app/views/workflows/stages/_color.html.erb | 2 +-
 test/models/card/colored_test.rb           | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 app/models/colorable.rb

diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index 1bbed5c32..43d0d5973 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -10,6 +10,6 @@ module WorkflowsHelper
   end
 
   def stage_color(stage)
-    stage.color.presence || Colorable::DEFAULT_COLOR
+    stage.color.presence || Card::DEFAULT_COLOR
   end
 end
diff --git a/app/models/card/colored.rb b/app/models/card/colored.rb
index 99e934a94..9a16ee4a4 100644
--- a/app/models/card/colored.rb
+++ b/app/models/card/colored.rb
@@ -1,8 +1,11 @@
 module Card::Colored
   extend ActiveSupport::Concern
 
+  COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ]
+  DEFAULT_COLOR = "#2c6da8"
+
   def color
-    color_from_stage || Colorable::DEFAULT_COLOR
+    color_from_stage || DEFAULT_COLOR
   end
 
   private
diff --git a/app/models/colorable.rb b/app/models/colorable.rb
deleted file mode 100644
index e774fd946..000000000
--- a/app/models/colorable.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Colorable
-  extend ActiveSupport::Concern
-
-  COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ]
-  DEFAULT_COLOR = "#2c6da8"
-end
diff --git a/app/views/workflows/stages/_color.html.erb b/app/views/workflows/stages/_color.html.erb
index 04a9e12a3..f2b6e3160 100644
--- a/app/views/workflows/stages/_color.html.erb
+++ b/app/views/workflows/stages/_color.html.erb
@@ -6,7 +6,7 @@
 
   <dialog class="color-picker panel fill-white shadow gap-half" data-dialog-target="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
     <%= form_with model: stage, url: workflow_stage_path(stage.workflow, stage), class: "flex gap-half", data: { controller: "form", action: "change->form#submit" } do |form| %>
-      <% Colorable::COLORS.each do |color| %>
+      <% Card::COLORS.each do |color| %>
         <span class="color-picker__color">
           <label class="btn btn--circle" style="--btn-background: <%= color %>" title="<%= color %>">
             <%= form.radio_button :color, color %>
diff --git a/test/models/card/colored_test.rb b/test/models/card/colored_test.rb
index f4bd1bf36..5eebec25f 100644
--- a/test/models/card/colored_test.rb
+++ b/test/models/card/colored_test.rb
@@ -2,11 +2,11 @@ require "test_helper"
 
 class Card::ColoredTest < ActiveSupport::TestCase
   test "use default color no stage" do
-    assert_equal Colorable::DEFAULT_COLOR, cards(:logo).color
+    assert_equal Card::DEFAULT_COLOR, cards(:logo).color
   end
 
   test "use default color not in doing stage" do
-    assert_equal Colorable::DEFAULT_COLOR, cards(:text).color
+    assert_equal Card::DEFAULT_COLOR, cards(:text).color
   end
 
   test "infer color from stage when in doing stage" do

From 7a46fd09483f2a1fe05f2d01c4be0d9b1461b678 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 12:08:56 +0200
Subject: [PATCH 07/48] Stick with open/close as a consistent pair instead of
 active/close

---
 app/models/card/closeable.rb       | 4 ++--
 app/models/card/engageable.rb      | 8 ++++----
 app/models/filter.rb               | 2 +-
 test/models/card/closeable_test.rb | 2 +-
 test/models/card_test.rb           | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb
index ce0a63e33..64945af0c 100644
--- a/app/models/card/closeable.rb
+++ b/app/models/card/closeable.rb
@@ -7,7 +7,7 @@ module Card::Closeable
     has_one :closure, dependent: :destroy
 
     scope :closed, -> { joins(:closure) }
-    scope :active, -> { where.missing(:closure) }
+    scope :open, -> { where.missing(:closure) }
 
     scope :recently_closed_first, -> { closed.order("closures.created_at": :desc) }
     scope :due_to_be_closed, -> { considering.where(last_active_at: ..AUTO_CLOSE_AFTER.ago) }
@@ -29,7 +29,7 @@ module Card::Closeable
     closure.present?
   end
 
-  def active?
+  def open?
     !closed?
   end
 
diff --git a/app/models/card/engageable.rb b/app/models/card/engageable.rb
index 78dbe0ebe..6671bc5a1 100644
--- a/app/models/card/engageable.rb
+++ b/app/models/card/engageable.rb
@@ -6,8 +6,8 @@ module Card::Engageable
   included do
     has_one :engagement, dependent: :destroy, class_name: "Card::Engagement"
 
-    scope :considering, -> { published_or_drafted_by(Current.user).active.where.missing(:engagement) }
-    scope :doing,       -> { published.active.joins(:engagement) }
+    scope :considering, -> { published_or_drafted_by(Current.user).open.where.missing(:engagement) }
+    scope :doing,       -> { published.open.joins(:engagement) }
     scope :stagnated,   -> { doing.where(last_active_at: ..STAGNATED_AFTER.ago) }
 
     scope :by_engagement_status, ->(status) do
@@ -29,11 +29,11 @@ module Card::Engageable
   end
 
   def doing?
-    active? && published? && engagement.present?
+    open? && published? && engagement.present?
   end
 
   def considering?
-    active? && published? && engagement.blank?
+    open? && published? && engagement.blank?
   end
 
   def engage
diff --git a/app/models/filter.rb b/app/models/filter.rb
index b2957bfd5..e5ce39383 100644
--- a/app/models/filter.rb
+++ b/app/models/filter.rb
@@ -19,7 +19,7 @@ class Filter < ApplicationRecord
   def cards
     @cards ||= begin
       result = creator.accessible_cards.indexed_by(indexed_by)
-      result = result.active unless indexed_by.closed?
+      result = result.open unless indexed_by.closed?
       result = result.by_engagement_status(engagement_status) if engagement_status.present?
       result = result.unassigned if assignment_status.unassigned?
       result = result.assigned_to(assignees.ids) if assignees.present?
diff --git a/test/models/card/closeable_test.rb b/test/models/card/closeable_test.rb
index b8effec74..738eaca53 100644
--- a/test/models/card/closeable_test.rb
+++ b/test/models/card/closeable_test.rb
@@ -3,7 +3,7 @@ require "test_helper"
 class Card::CloseableTest < ActiveSupport::TestCase
   test "closed scope" do
     assert_equal [ cards(:shipping) ], Card.closed
-    assert_not_includes Card.active, cards(:shipping)
+    assert_not_includes Card.open, cards(:shipping)
   end
 
   test "popping" do
diff --git a/test/models/card_test.rb b/test/models/card_test.rb
index 93f13e565..3d251e278 100644
--- a/test/models/card_test.rb
+++ b/test/models/card_test.rb
@@ -70,8 +70,8 @@ class CardTest < ActiveSupport::TestCase
     assert_equal [ cards(:shipping) ], Card.closed
   end
 
-  test "active" do
-    assert_equal cards(:logo, :layout, :text), Card.active
+  test "open" do
+    assert_equal cards(:logo, :layout, :text), Card.open
   end
 
   test "unassigned" do

From 20a29651813b7aa194dbdaf3a8a03e1fe3123dcc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 12:12:30 +0200
Subject: [PATCH 08/48] Keep scopes together

---
 app/models/card/golden.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/card/golden.rb b/app/models/card/golden.rb
index 759179415..4f2f52a60 100644
--- a/app/models/card/golden.rb
+++ b/app/models/card/golden.rb
@@ -2,10 +2,9 @@ module Card::Golden
   extend ActiveSupport::Concern
 
   included do
-    scope :golden, -> { joins(:goldness) }
-
     has_one :goldness, dependent: :destroy, class_name: "Card::Goldness"
 
+    scope :golden, -> { joins(:goldness) }
     scope :with_golden_first, -> { left_outer_joins(:goldness).prepend_order("card_goldnesses.id IS NULL") }
   end
 

From 827c00ce490420baa5d1a120fb234f4ef0cd83ac Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 12:32:34 +0200
Subject: [PATCH 09/48] Extract Workflowing concern

---
 app/models/card/staged.rb            |  8 ++------
 app/models/collection.rb             | 10 +---------
 app/models/collection/workflowing.rb | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 app/models/collection/workflowing.rb

diff --git a/app/models/card/staged.rb b/app/models/card/staged.rb
index de853b818..da3269ad7 100644
--- a/app/models/card/staged.rb
+++ b/app/models/card/staged.rb
@@ -4,7 +4,7 @@ module Card::Staged
   included do
     belongs_to :stage, class_name: "Workflow::Stage", optional: true
 
-    after_create :assign_initial_stage
+    before_create :assign_initial_stage
 
     scope :in_stage, ->(stage) { where stage: stage }
   end
@@ -24,10 +24,6 @@ module Card::Staged
 
   private
     def assign_initial_stage
-      if workflow_stage = collection.workflow&.stages&.first
-        self.stage = workflow_stage
-        save! touch: false
-        track_event :staged, stage_id: workflow_stage.id, stage_name: workflow_stage.name
-      end
+      self.stage = collection.initial_workflow_stage
     end
 end
diff --git a/app/models/collection.rb b/app/models/collection.rb
index 5f4a75051..236208c16 100644
--- a/app/models/collection.rb
+++ b/app/models/collection.rb
@@ -1,18 +1,10 @@
 class Collection < ApplicationRecord
-  include Accessible, Broadcastable, Filterable
+  include Accessible, Broadcastable, Filterable, Workflowing
 
   belongs_to :creator, class_name: "User", default: -> { Current.user }
-  belongs_to :workflow, optional: true
 
   has_many :cards, dependent: :destroy
   has_many :tags, -> { distinct }, through: :cards
 
-  after_save :update_cards_workflow, if: :saved_change_to_workflow_id?
-
   scope :alphabetically, -> { order("lower(name)") }
-
-  private
-    def update_cards_workflow
-      cards.update_all(stage_id: workflow&.stages&.first&.id)
-    end
 end
diff --git a/app/models/collection/workflowing.rb b/app/models/collection/workflowing.rb
new file mode 100644
index 000000000..658087fe2
--- /dev/null
+++ b/app/models/collection/workflowing.rb
@@ -0,0 +1,18 @@
+module Collection::Workflowing
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :workflow, optional: true
+
+    after_update_commit :set_all_cards_to_initial_workflow_stage, if: :saved_change_to_workflow_id?
+  end
+
+  def initial_workflow_stage
+    workflow&.stages&.first
+  end
+
+  private
+    def set_all_cards_to_initial_workflow_stage
+      cards.update_all(stage_id: initial_workflow_stage&.id)
+    end
+end

From a7d17b38aa41a8a32f95116d388af25b000bee2e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 12:44:49 +0200
Subject: [PATCH 10/48] Be confident

---
 app/models/collection/workflowing.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/collection/workflowing.rb b/app/models/collection/workflowing.rb
index 658087fe2..0793f804f 100644
--- a/app/models/collection/workflowing.rb
+++ b/app/models/collection/workflowing.rb
@@ -13,6 +13,6 @@ module Collection::Workflowing
 
   private
     def set_all_cards_to_initial_workflow_stage
-      cards.update_all(stage_id: initial_workflow_stage&.id)
+      cards.update_all(stage_id: initial_workflow_stage.id)
     end
 end

From 8e35a3de9c5a802e2e9985a51dd436410f38b1dd Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 13:03:31 +0200
Subject: [PATCH 11/48] Test workflowing updates card stages on change

---
 test/fixtures/cards.yml                    | 4 ++++
 test/models/collection/workflowing_test.rb | 8 ++++++++
 test/models/filter_test.rb                 | 6 +++---
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 test/models/collection/workflowing_test.rb

diff --git a/test/fixtures/cards.yml b/test/fixtures/cards.yml
index c8dc163a3..2ca8fbf8f 100644
--- a/test/fixtures/cards.yml
+++ b/test/fixtures/cards.yml
@@ -1,6 +1,7 @@
 logo:
   collection: writebook
   creator: david
+  stage: qa_triage
   title: The logo isn't big enough
   due_on: <%= 3.days.from_now %>
   created_at: <%= 1.week.ago %>
@@ -10,6 +11,7 @@ logo:
 layout:
   collection: writebook
   creator: david
+  stage: qa_triage
   title: Layout is broken
   created_at: <%= 1.week.ago %>
   status: published
@@ -18,6 +20,7 @@ layout:
 text:
   collection: writebook
   creator: kevin
+  stage: qa_triage
   title: The text is too small
   created_at: <%= 1.week.ago %>
   status: published
@@ -27,6 +30,7 @@ text:
 shipping:
   collection: writebook
   creator: kevin
+  stage: qa_triage
   title: We need to ship the app
   created_at: <%= 1.week.ago %>
   status: published
diff --git a/test/models/collection/workflowing_test.rb b/test/models/collection/workflowing_test.rb
new file mode 100644
index 000000000..ec12bbc9d
--- /dev/null
+++ b/test/models/collection/workflowing_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class Collection::WorkflowingTest < ActiveSupport::TestCase
+  test "change all card stages when changing workflow" do
+    collections(:writebook).update! workflow: workflows(:on_call)
+    assert_equal [ collections(:writebook).initial_workflow_stage ], collections(:writebook).cards.reload.collect(&:stage).uniq
+  end
+end
diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb
index 9b591bd76..cff0341d0 100644
--- a/test/models/filter_test.rb
+++ b/test/models/filter_test.rb
@@ -5,11 +5,11 @@ class FilterTest < ActiveSupport::TestCase
     Current.set session: sessions(:david) do
       @new_collection = Collection.create! name: "Inaccessible Collection"
       @new_card = @new_collection.cards.create!
-      @new_card.update!(stage: workflow_stages(:qa_triage))
+      @new_card.update!(stage: workflow_stages(:qa_on_hold))
 
       cards(:layout).capture Comment.new(body: "I hate haggis")
       cards(:logo).capture Comment.new(body: "I love haggis")
-      cards(:logo).update(stage: workflow_stages(:qa_triage))
+      cards(:logo).update(stage: workflow_stages(:qa_on_hold))
     end
 
     assert_not_includes users(:kevin).filters.new.cards, @new_card
@@ -17,7 +17,7 @@ class FilterTest < ActiveSupport::TestCase
     filter = users(:david).filters.new creator_ids: [ users(:david).id ], tag_ids: [ tags(:mobile).id ]
     assert_equal [ cards(:layout) ], filter.cards
 
-    filter = users(:david).filters.new stage_ids: [ workflow_stages(:qa_triage).id ]
+    filter = users(:david).filters.new stage_ids: [ workflow_stages(:qa_on_hold).id ]
     assert_equal [ cards(:logo), @new_card ], filter.cards
 
     filter = users(:david).filters.new assignment_status: "unassigned", collection_ids: [ @new_collection.id ]

From 5ea0ec8cb4f10ead1773e8e0e9af01f50253a246 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 13:05:39 +0200
Subject: [PATCH 12/48] Test and fix setting workflow to nothing

---
 app/models/collection/workflowing.rb       | 2 +-
 test/models/collection/workflowing_test.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/collection/workflowing.rb b/app/models/collection/workflowing.rb
index 0793f804f..658087fe2 100644
--- a/app/models/collection/workflowing.rb
+++ b/app/models/collection/workflowing.rb
@@ -13,6 +13,6 @@ module Collection::Workflowing
 
   private
     def set_all_cards_to_initial_workflow_stage
-      cards.update_all(stage_id: initial_workflow_stage.id)
+      cards.update_all(stage_id: initial_workflow_stage&.id)
     end
 end
diff --git a/test/models/collection/workflowing_test.rb b/test/models/collection/workflowing_test.rb
index ec12bbc9d..c43cda6ed 100644
--- a/test/models/collection/workflowing_test.rb
+++ b/test/models/collection/workflowing_test.rb
@@ -5,4 +5,9 @@ class Collection::WorkflowingTest < ActiveSupport::TestCase
     collections(:writebook).update! workflow: workflows(:on_call)
     assert_equal [ collections(:writebook).initial_workflow_stage ], collections(:writebook).cards.reload.collect(&:stage).uniq
   end
+
+  test "remove stage from cards if workflow is removed" do
+    collections(:writebook).update! workflow: nil
+    assert_equal [], collections(:writebook).cards.reload.collect(&:stage).compact
+  end
 end

From 3d28203224ed502ffbe387e35352b95c68d8aa7b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 14:44:55 +0200
Subject: [PATCH 13/48] Use singular staging resource and beef up testing

---
 app/controllers/cards/stagings_controller.rb     | 16 ++--------------
 app/helpers/workflows_helper.rb                  |  4 ++--
 app/models/card/staged.rb                        |  6 ++----
 config/routes.rb                                 |  4 ++--
 .../cards/stagings_controller_test.rb            | 12 ++++++++++++
 test/integration/card_messages.rb                | 14 --------------
 test/models/card/staged_test.rb                  | 12 ++++++++++++
 7 files changed, 32 insertions(+), 36 deletions(-)
 create mode 100644 test/controllers/cards/stagings_controller_test.rb
 create mode 100644 test/models/card/staged_test.rb

diff --git a/app/controllers/cards/stagings_controller.rb b/app/controllers/cards/stagings_controller.rb
index 102c17599..714427ecf 100644
--- a/app/controllers/cards/stagings_controller.rb
+++ b/app/controllers/cards/stagings_controller.rb
@@ -1,20 +1,8 @@
 class Cards::StagingsController < ApplicationController
   include CardScoped
 
-  before_action :set_stage
-
-  def create
-    if @stage
-      @card.toggle_stage @stage
-    else
-      @card.update!(stage: nil)
-    end
-
+  def update
+    @card.change_stage_to @collection.workflow.stages.find(params[:stage_id])
     render_card_replacement
   end
-
-  private
-    def set_stage
-      @stage = Workflow::Stage.find_by(id: params[:stage_id])
-    end
 end
diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index 43d0d5973..560e1aebf 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -2,8 +2,8 @@ module WorkflowsHelper
   def button_to_set_stage(card, stage)
     button_to \
       tag.span(stage.name, class: "overflow-ellipsis"),
-      card_stagings_path(card, stage_id: stage),
-      method: :post,
+      card_staging_path(card, stage_id: stage),
+      method: :put,
       class: [ "btn justify-start workflow-stage txt-uppercase workflow-stage", { "workflow-stage--current": stage == card.stage } ],
       form_class: "flex align-center gap-half",
       data: { turbo_frame: "_top" }
diff --git a/app/models/card/staged.rb b/app/models/card/staged.rb
index da3269ad7..f8036d3e3 100644
--- a/app/models/card/staged.rb
+++ b/app/models/card/staged.rb
@@ -13,12 +13,10 @@ module Card::Staged
     stage&.workflow
   end
 
-  def toggle_stage(stage)
-    new_stage, event = self.stage_id == stage.id ? [ nil, :unstaged ] : [ stage, :staged ]
-
+  def change_stage_to(new_stage)
     transaction do
       update! stage: new_stage
-      track_event event, stage_id: stage.id, stage_name: stage.name
+      track_event :staged, stage_id: new_stage.id, stage_name: new_stage.name
     end
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index 61271338a..4e1d24f88 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,17 +26,17 @@ Rails.application.routes.draw do
   resources :cards do
     scope module: :cards do
       resource :engagement
+      resource :goldness
       resource :image
       resource :pin
       resource :closure
       resource :publish
       resource :reading
       resource :recover
+      resource :staging
       resource :watch
-      resource :goldness
 
       resources :assignments
-      resources :stagings
       resources :taggings
 
       resources :comments do
diff --git a/test/controllers/cards/stagings_controller_test.rb b/test/controllers/cards/stagings_controller_test.rb
new file mode 100644
index 000000000..5e49876f5
--- /dev/null
+++ b/test/controllers/cards/stagings_controller_test.rb
@@ -0,0 +1,12 @@
+require "test_helper"
+
+class Cards::StagingsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "update" do
+    put card_staging_path(cards(:logo)), params: { stage_id: workflow_stages(:qa_in_progress).id }, as: :turbo_stream
+    assert_card_container_rerendered(cards(:logo))
+  end
+end
diff --git a/test/integration/card_messages.rb b/test/integration/card_messages.rb
index 29eded2f0..0253e45f3 100644
--- a/test/integration/card_messages.rb
+++ b/test/integration/card_messages.rb
@@ -25,19 +25,5 @@ class CardMessagesTest < ActionDispatch::IntegrationTest
     assert_predicate card.messages.last, :event_summary?
     assert_equal 1, card.messages.last.event_summary.events.count
     assert_equal "assigned", card.messages.last.messageable.events.last.action
-
-    # Stage it
-    post card_stagings_path(card), params: { stage_id: workflow_stages(:qa_triage).id }
-    assert_equal 3, card.messages.count
-    assert_predicate card.messages.last, :event_summary?
-    assert_equal 2, card.messages.last.event_summary.events.count
-    assert_equal "staged", card.messages.last.messageable.events.last.action
-
-    # Unstage it
-    post card_stagings_path(card), params: { stage_id: workflow_stages(:qa_triage).id }
-    assert_equal 3, card.messages.count
-    assert_predicate card.messages.last, :event_summary?
-    assert_equal 3, card.messages.last.event_summary.events.count
-    assert_equal "unstaged", card.messages.last.messageable.events.last.action
   end
 end
diff --git a/test/models/card/staged_test.rb b/test/models/card/staged_test.rb
new file mode 100644
index 000000000..492374fb5
--- /dev/null
+++ b/test/models/card/staged_test.rb
@@ -0,0 +1,12 @@
+require "test_helper"
+
+class Card::StagedTest < ActiveSupport::TestCase
+  setup { Current.session = sessions(:david) }
+
+  test "change stage" do
+    assert_difference -> { Event.where(action: :staged).count }, +1 do
+      cards(:logo).change_stage_to(workflow_stages(:qa_in_progress))
+      assert_equal workflow_stages(:qa_in_progress), cards(:logo).reload.stage
+    end
+  end
+end

From dcf135c00343d32ef0010ea5fc194d472a9427da Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Tue, 22 Apr 2025 14:45:22 +0200
Subject: [PATCH 14/48] Fix rubocop

---
 db/seeds/honcho.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/seeds/honcho.rb b/db/seeds/honcho.rb
index 9132177ab..34599c600 100644
--- a/db/seeds/honcho.rb
+++ b/db/seeds/honcho.rb
@@ -9,7 +9,7 @@ sarah = create_user "Sarah Johnson", "sarah@37signals.com"
 mike = create_user "Mike Peterson", "mike@37signals.com"
 
 # Array of authors for random assignment
-authors = [david, jason, kevin, sarah, mike]
+authors = [ david, jason, kevin, sarah, mike ]
 
 # Card titles for reuse across collections
 card_titles = [
@@ -60,14 +60,14 @@ collections.each_with_index do |collection_name, index|
         # Randomly assign to 1-2 authors
         card.toggle_assignment(authors.sample)
         card.toggle_assignment(authors.sample) if rand > 0.5
- 
+
         # Randomly set card state
         case rand(3)
         when 0
           card.engage
         when 1
           card.close
-        # 2 remains open
+          # 2 remains open
         end
       end
     end

From 4f87472e5a5e82fde0a3fa5b38a2c8b2441a9fe9 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 12:00:49 -0500
Subject: [PATCH 15/48] Restore clicks on pinned cards

---
 app/assets/stylesheets/pins.css           | 4 ++++
 app/views/cards/display/_preview.html.erb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pins.css b/app/assets/stylesheets/pins.css
index e42f2d3e7..c191dea7b 100644
--- a/app/assets/stylesheets/pins.css
+++ b/app/assets/stylesheets/pins.css
@@ -42,6 +42,10 @@
       padding-block-end: 0;
     }
 
+    .card__link {
+      z-index: 1;
+    }
+
     .card__title {
       font-size: var(--text-small);
       font-weight: bold;
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index 43284b534..60c416ba6 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -10,7 +10,7 @@
         <%= card.title %>
       </h1>
 
-      <%= link_to collection_card_path(card.collection, card), class: "card__link" do %>
+      <%= link_to collection_card_path(card.collection, card), class: "card__link", data: { turbo_frame: "_top" } do %>
         <span class="for-screen-reader"><%= card.title %></span>
       <% end %>
 

From 51ef76ff4bf492273a2a5221d7ee202004a8dee9 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 12:04:53 -0500
Subject: [PATCH 16/48] This was on the wrong element

 Caused some pinned cards to be an irregular height
---
 app/assets/stylesheets/pins.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/pins.css b/app/assets/stylesheets/pins.css
index c191dea7b..1423b6285 100644
--- a/app/assets/stylesheets/pins.css
+++ b/app/assets/stylesheets/pins.css
@@ -47,15 +47,13 @@
     }
 
     .card__title {
+      --lines: 1;
+    
       font-size: var(--text-small);
       font-weight: bold;
       min-block-size: 0;
     }
 
-    .card__title-link {
-      --lines: 1;
-    }
-
     .card__stages {
       padding: 0;
     }

From cde8634bfecf31c0ba60315eb5f5223adc02179f Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 12:59:36 -0500
Subject: [PATCH 17/48] Adjust the stages column sizing

---
 app/assets/stylesheets/cards.css          | 12 ++++++++----
 app/views/cards/_container.html.erb       |  2 +-
 app/views/cards/container/_title.html.erb |  8 ++++----
 app/views/cards/display/_preview.html.erb | 16 +++++++++-------
 app/views/cards/edit.html.erb             |  2 +-
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 4be6b06ed..9e4d8dc11 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -116,6 +116,10 @@
     }
   }
 
+  .card__content {
+    flex: 2 1 auto;
+  }
+
   .card__title {
     --hover-size: 0;
     --input-border-radius: 0;
@@ -123,7 +127,6 @@
     --lines: 3;
 
     color: inherit;
-    flex: 2 1 75%;
     font-size: var(--text-xx-large);
     font-weight: 900;
     line-height: 1.2;
@@ -148,10 +151,11 @@
 
   .card__stages {
     display: flex;
-    flex: 1 1 25%;
+    flex: 0 1 auto;
     flex-direction: column;
-    max-width: 100%;
-    min-width: 0;
+    justify-self: end;
+    max-inline-size: 20ch;
+    min-inline-size: 15ch;
     padding-block: var(--block-space-half);
   }
 
diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb
index 034106e59..f64ff7e91 100644
--- a/app/views/cards/_container.html.erb
+++ b/app/views/cards/_container.html.erb
@@ -19,7 +19,7 @@
         <%= render "cards/display/perma/tags", card: card %>
       </header>
 
-      <div class="card__body flex gap full-width flex-item-grow">
+      <div class="card__body flex gap full-width flex-item-grow justify-space-between">
         <%= render "cards/container/title", card: card %>
         <%= render "cards/stagings/stages", card: card if card.doing? %>
       </div>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index f3ab76788..39c097d6c 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -1,16 +1,16 @@
 <% if card.published? %>
   <%= turbo_frame_tag card, :edit do %>
-    <div class="full-width">
+    <div class="card__content">
       <h1 class="card__title flex align-start gap-half">
         <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link" %>
       </h1>
-      <p class="card__description margin-block-half">
+      <div class="card__description margin-block-half">
         <%= sanitize card.description_html %>
-      </p>
+      </div>
     </div>
   <% end %>
 <% else %>
-  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "full-width", data: { controller: "auto-save" } do |form| %>
+  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "card__content", data: { controller: "auto-save" } do |form| %>
     <h1 class="card__title">
       <%= form.text_area :title, placeholder: "Name it…",
             class: "input input--textarea full-width borderless txt-align-start",
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index 60c416ba6..a909089cb 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -5,14 +5,16 @@
       <%= render "cards/display/preview/tags", card: card %>
     </header>
 
-    <div class="card__body flex gap full-width flex-item-grow">
-      <h1 class="card__title overflow-line-clamp">
-        <%= card.title %>
-      </h1>
+    <div class="card__body flex gap full-width flex-item-grow justify-space-between">
+      <div class="card__content">
+        <h1 class="card__title overflow-line-clamp">
+          <%= card.title %>
+        </h1>
 
-      <%= link_to collection_card_path(card.collection, card), class: "card__link", data: { turbo_frame: "_top" } do %>
-        <span class="for-screen-reader"><%= card.title %></span>
-      <% end %>
+        <%= link_to collection_card_path(card.collection, card), class: "card__link", data: { turbo_frame: "_top" } do %>
+          <span class="for-screen-reader"><%= card.title %></span>
+        <% end %>
+      </div>
 
       <%= render "cards/stagings/stages", card: card if card.doing? %>
     </div>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index ad509b0e0..7770d82bd 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -1,5 +1,5 @@
 <%= turbo_frame_tag @card, :edit do %>
-  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "full-width", data: { controller: "form paste" } do |form| %>
+  <%= form_with model: @card, url: collection_card_path(@card.collection, @card), class: "card__content", data: { controller: "form paste" } do |form| %>
     <h1 class="card__title">
       <%= form.label :title, class: "flex flex-column align-center" do %>
         <%= form.text_area :title, class: "input input--textarea full-width borderless txt-align-start card-field__title",

From 3792966a23e0c077a7df8feed8187d01361d4b30 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:40:55 -0500
Subject: [PATCH 18/48] Blind attempt fix select options in browsers with
 non-native pickers

See: https://37s.fizzy.37signals.com/collections/693169850/cards/999008955
---
 app/assets/stylesheets/inputs.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/inputs.css b/app/assets/stylesheets/inputs.css
index 5e3ba772c..35854aac6 100644
--- a/app/assets/stylesheets/inputs.css
+++ b/app/assets/stylesheets/inputs.css
@@ -94,6 +94,11 @@
     @media (prefers-color-scheme: dark) {
       background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23fff'/%3E%3C/svg%3E");
     }
+
+    option {
+      background-color: var(--color-bg);
+      color: var(--color-ink);
+    }
   }
 
   .input--textarea {

From c4864752f464bb57984ea5bb1bba9bfa156dcb79 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:53:08 -0500
Subject: [PATCH 19/48] Card descriptions need styles shared with comments

---
 .../stylesheets/{comment-content.css => markdown-content.css} | 2 +-
 app/views/cards/comments/_comment.html.erb                    | 2 +-
 app/views/cards/comments/_new.html.erb                        | 2 +-
 app/views/cards/comments/edit.html.erb                        | 2 +-
 app/views/cards/container/_title.html.erb                     | 4 ++--
 app/views/cards/edit.html.erb                                 | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename app/assets/stylesheets/{comment-content.css => markdown-content.css} (98%)

diff --git a/app/assets/stylesheets/comment-content.css b/app/assets/stylesheets/markdown-content.css
similarity index 98%
rename from app/assets/stylesheets/comment-content.css
rename to app/assets/stylesheets/markdown-content.css
index 9944ed45f..9d094aade 100644
--- a/app/assets/stylesheets/comment-content.css
+++ b/app/assets/stylesheets/markdown-content.css
@@ -1,5 +1,5 @@
 @layer components {
-  .comments {
+  .markdown-content {
     :where(h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6) {
       font-weight: 800;
       hyphens: auto;
diff --git a/app/views/cards/comments/_comment.html.erb b/app/views/cards/comments/_comment.html.erb
index 427fae8ad..0594d6cd5 100644
--- a/app/views/cards/comments/_comment.html.erb
+++ b/app/views/cards/comments/_comment.html.erb
@@ -21,7 +21,7 @@
           <% end %>
         </div>
 
-        <div class="comment__body txt-align-start">
+        <div class="comment__body markdown-content txt-align-start">
           <%= sanitize comment.body_html %>
         </div>
 
diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb
index 2352d1797..c4645fe86 100644
--- a/app/views/cards/comments/_new.html.erb
+++ b/app/views/cards/comments/_new.html.erb
@@ -4,7 +4,7 @@
   </figure>
 
   <div class="comment__content flex-inline flex-column full-width">
-    <div class="comment__body txt-align-start">
+    <div class="comment__body markdown-content txt-align-start">
       <%= form_with model: Comment.new, url: card_comments_path(card), class: "flex flex-column gap full-width",
             data: { controller: "form paste local-save",
                     local_save_key_value: "comment-#{card.id}",
diff --git a/app/views/cards/comments/edit.html.erb b/app/views/cards/comments/edit.html.erb
index cfe22b4c0..d07b50334 100644
--- a/app/views/cards/comments/edit.html.erb
+++ b/app/views/cards/comments/edit.html.erb
@@ -1,6 +1,6 @@
 <%= turbo_frame_tag dom_id(@comment) do %>
   <div class="comment__content comment--edit flex-inline flex-column full-width">
-    <div class="comment__body txt-align-start">
+    <div class="comment__body markdown-content txt-align-start">
       <%= form_with model: [ @card, @comment ], class: "flex flex-column gap full-width",
             data: { controller: "form paste", action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } do |form| %>
         <%= form.markdown_area :body, class: "input comment__input", required: true, autofocus: true, placeholder: new_comment_placeholder(@card) %>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index 39c097d6c..d3c3baa33 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -4,7 +4,7 @@
       <h1 class="card__title flex align-start gap-half">
         <%= link_to card.title, edit_collection_card_path(card.collection, card), class: "card__title-link" %>
       </h1>
-      <div class="card__description margin-block-half">
+      <div class="card__description markdown-content margin-block-half">
         <%= sanitize card.description_html %>
       </div>
     </div>
@@ -17,7 +17,7 @@
             autofocus: card.title.blank?,
             data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %>
     </h1>
-    <div class="card__description margin-block-half">
+    <div class="card__description markdown-content margin-block-half">
       <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
             placeholder: "Add some notes, context, pictures, or video about this…",
             data: { action: "house-md:change->auto-save#change focusout->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index 7770d82bd..e75a1d03c 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -8,7 +8,7 @@
               data: { action: "keydown.enter->form#submit:prevent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel focus->form#select" } %>
       <% end %>
     </h1>
-    <div class="card__description margin-block-half">
+    <div class="card__description markdown-content margin-block-half">
       <%= form.markdown_area :description, class: "input input--textarea full-width borderless txt-align-start card-field__description",
             placeholder: "Add some notes, context, pictures, or video about this…",
             data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>

From 83a56e4ffedfe536ce35d458af763b4789e0e76c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:54:25 -0500
Subject: [PATCH 20/48] No longer used

---
 app/assets/stylesheets/workflows.css | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/assets/stylesheets/workflows.css b/app/assets/stylesheets/workflows.css
index d69dbfe3b..21e36b9c6 100644
--- a/app/assets/stylesheets/workflows.css
+++ b/app/assets/stylesheets/workflows.css
@@ -27,13 +27,5 @@
         background-color: color(from var(--card-color) srgb r g b / 0.65);
       }
     }
-
-    .ticket & {
-      --btn-background: var(--color-ink);
-
-      background: var(--card-color);
-      border-radius: 0.2em;
-      color: var(--color-ink-reversed);
-    }
   }
 }

From 9b57480b4089566129e273a0dd00fee0a8e0b7f3 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:55:46 -0500
Subject: [PATCH 21/48] `ticket` is a vestige of a previous design

---
 app/helpers/cards_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb
index 31c370479..27bdd2595 100644
--- a/app/helpers/cards_helper.rb
+++ b/app/helpers/cards_helper.rb
@@ -15,7 +15,7 @@ module CardsHelper
       **options
   end
 
-  def card_article_tag(card, id: dom_id(card, :ticket), **options, &block)
+  def card_article_tag(card, id: dom_id(card, :article), **options, &block)
     classes = [
       options.delete(:class),
       ("card--golden" if card.golden?),

From d7de62a047f24f71e32a66a6826117e76795f56d Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 13:57:24 -0500
Subject: [PATCH 22/48] Pinned cards might be on the same screen which causes a
 name collision

---
 app/assets/stylesheets/pins.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/pins.css b/app/assets/stylesheets/pins.css
index 1423b6285..50da7657e 100644
--- a/app/assets/stylesheets/pins.css
+++ b/app/assets/stylesheets/pins.css
@@ -31,6 +31,7 @@
       --text-xx-large: 2em;
 
       border: 1px solid var(--color-bg);
+      view-transition-name: unset !important;
     }
 
     .card__collection {

From 78d186bebd71e60cde484dafc61aaf7111524013 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 20:59:49 +0200
Subject: [PATCH 23/48] Really liking the new it-style yields in many places

---
 app/models/concerns/filterable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index b3cb07c46..75f98cdce 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -10,6 +10,6 @@ module Filterable
 
   private
     def remove_from_filters
-      filters.each { |filter| filter.resource_removed self }
+      filters.each { it.resource_removed self }
     end
 end

From 134333ae44b8c41f2fc63995f182c74c574b229a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:01:11 +0200
Subject: [PATCH 24/48] Dont do a lot of work inside a single transaction

Especially with sqlite3!
---
 app/models/concerns/filterable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 75f98cdce..e1a11abd8 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -5,7 +5,7 @@ module Filterable
     has_and_belongs_to_many :filters
 
     after_update { filters.touch_all }
-    before_destroy :remove_from_filters
+    before_destroy_commit :remove_from_filters
   end
 
   private

From d9481eb0217b7405dc8cff4f6db03a243d124e27 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:08:48 -0500
Subject: [PATCH 25/48] Whitespace

---
 app/views/cards/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index e75a1d03c..f6ca2c09a 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -13,7 +13,7 @@
             placeholder: "Add some notes, context, pictures, or video about this…",
             data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop paste->paste#pasteFiles" } %>
     </div>
-    <%= form.button "Save changes", type: :submit, class: "btn"%>
+    <%= form.button "Save changes", type: :submit, class: "btn" %>
     <%= link_to "Close editor and discard changes", collection_card_path(@card.collection, @card), data: { form_target: "cancel" }, hidden: true %>
   <% end %>
 <% end %>

From 024b54a8a752c57e8e6fcc1e8ff80c98bcf9aa0f Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:15:48 -0500
Subject: [PATCH 26/48] Get this effect with `mix-blend-mode`

---
 app/assets/stylesheets/cards.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 9e4d8dc11..b913db6a9 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -218,10 +218,10 @@
     flex-direction: column;
     inset: auto var(--block-space) var(--block-space-double) auto;
     justify-content: space-between;
+    mix-blend-mode: multiply;
     padding: var(--block-space-half) calc(var(--inline-space) * 1.5);
     position: absolute;
     transform: rotate(-10deg);
-    z-index: -1;
   }
 
   .card__closed-by {

From 6cd8d54bf71ca141fa04b3fb94b38407a12d27eb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:20:18 +0200
Subject: [PATCH 27/48] We werent using any of the other avatar methods

---
 app/models/user.rb        |  3 ++-
 app/models/user/avatar.rb | 17 -----------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 app/models/user/avatar.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index a22841c42..f16a77b0c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,8 +1,9 @@
 class User < ApplicationRecord
-  include Accessor, Assignee, Avatar, Role, Transferable
+  include Accessor, Assignee, Role, Transferable
 
   has_many :sessions, dependent: :destroy
   has_secure_password validations: false
+  has_one_attached :avatar
 
   has_many :comments, inverse_of: :creator, dependent: :destroy
 
diff --git a/app/models/user/avatar.rb b/app/models/user/avatar.rb
deleted file mode 100644
index a9d2ad12e..000000000
--- a/app/models/user/avatar.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module User::Avatar
-  extend ActiveSupport::Concern
-
-  included do
-    has_one_attached :avatar
-  end
-
-  class_methods do
-    def from_avatar_token(sid)
-      find_signed!(sid, purpose: :avatar)
-    end
-  end
-
-  def avatar_token
-    signed_id(purpose: :avatar)
-  end
-end

From c4fbed315657be120e0bbfe1bce18afaee5087cf Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:20:55 +0200
Subject: [PATCH 28/48] Try a slimmer version

And I actually stopped liking that setup automatically starts the
server.
---
 bin/setup | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/bin/setup b/bin/setup
index ad27b6637..c7223d499 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,31 +1,14 @@
 #!/usr/bin/env ruby
-require "fileutils"
 
-APP_ROOT = File.expand_path("..", __dir__)
+def system!(*args) system(*args, exception: true) end
 
-def system!(*args)
-  system(*args, exception: true)
-end
+puts "== Installing dependencies =="
+system("gem install bundler --conservative")
+system("bundle check") || system!("bundle install")
 
-FileUtils.chdir APP_ROOT do
-  # This script is a way to set up or update your development environment automatically.
-  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
-  # Add necessary setup steps to this file.
+puts "\n== Preparing database =="
+system! "bin/rails db:prepare"
+system! "bin/rails db:reset" if ARGV.include?("--reset")
 
-  puts "== Installing dependencies =="
-  system("gem install bundler --conservative")
-  system("bundle check") || system!("bundle install")
-
-  puts "\n== Preparing database =="
-  system! "bin/rails db:prepare"
-  system! "bin/rails db:reset" if ARGV.include?("--reset")
-
-  puts "\n== Removing old logs and tempfiles =="
-  system! "bin/rails log:clear tmp:clear"
-
-  unless ARGV.include?("--skip-server")
-    puts "\n== Starting development server =="
-    STDOUT.flush # flush the output before exec(2) so that it displays
-    exec "bin/dev"
-  end
-end
+puts "\n== Removing old logs and tempfiles =="
+system! "bin/rails log:clear tmp:clear"

From b46461d7eddc490635af7d4d26c8b943cceb768c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:21:14 -0500
Subject: [PATCH 29/48] Errant `bubbles` => `cards` replacement

---
 app/javascript/controllers/local_save_controller.js | 2 +-
 app/javascript/controllers/paste_controller.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/controllers/local_save_controller.js b/app/javascript/controllers/local_save_controller.js
index c0c5892aa..5d9b89a72 100644
--- a/app/javascript/controllers/local_save_controller.js
+++ b/app/javascript/controllers/local_save_controller.js
@@ -47,7 +47,7 @@ export default class extends Controller {
   #triggerChangeEvent(newValue) {
     if (this.inputTarget.tagName === "HOUSE-MD") {
       this.inputTarget.dispatchEvent(new CustomEvent('house-md:change', {
-        cards: true,
+        bubbles: true,
         detail: {
           previousContent: '',
           newContent: newValue
diff --git a/app/javascript/controllers/paste_controller.js b/app/javascript/controllers/paste_controller.js
index 41fc77d2c..79db7d7db 100644
--- a/app/javascript/controllers/paste_controller.js
+++ b/app/javascript/controllers/paste_controller.js
@@ -12,7 +12,7 @@ export default class extends Controller {
 
     for (const file of files) {
       const uploadEvent = new CustomEvent("house-md:before-upload", { 
-        cards: true, 
+        bubbles: true, 
         detail: { file },
         cancelable: true 
       })

From ad1e97767d317570585d16e8098e60cf6e50ab38 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:22:42 +0200
Subject: [PATCH 30/48] Style

---
 app/models/workflow.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/workflow.rb b/app/models/workflow.rb
index b1e1fdb22..3174289dd 100644
--- a/app/models/workflow.rb
+++ b/app/models/workflow.rb
@@ -7,7 +7,6 @@ class Workflow < ApplicationRecord
 
   private
     def create_default_stages
-      Workflow::Stage.insert_all \
-        DEFAULT_STAGES.collect { |default_stage_name| { workflow_id: id, name: default_stage_name } }
+      Workflow::Stage.insert_all(DEFAULT_STAGES.map { { name: it, workflow_id: id } })
     end
 end

From 8c43615d7119b5093830857e0c747a81e8b3ab2b Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:23:44 -0500
Subject: [PATCH 31/48] Missing controller

---
 app/views/cards/container/_title.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index d3c3baa33..38970a04a 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -10,7 +10,7 @@
     </div>
   <% end %>
 <% else %>
-  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "card__content", data: { controller: "auto-save" } do |form| %>
+  <%= form_with model: card, url: collection_card_path(card.collection, card), id: "card_form", class: "card__content", data: { controller: "paste auto-save" } do |form| %>
     <h1 class="card__title">
       <%= form.text_area :title, placeholder: "Name it…",
             class: "input input--textarea full-width borderless txt-align-start",

From 72d1d0baee59e68a7534b9ecbe6441ad7edbbbfc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:24:51 +0200
Subject: [PATCH 32/48] Not related to the other two

---
 app/models/user.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index f16a77b0c..284de79cf 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,6 +3,7 @@ class User < ApplicationRecord
 
   has_many :sessions, dependent: :destroy
   has_secure_password validations: false
+
   has_one_attached :avatar
 
   has_many :comments, inverse_of: :creator, dependent: :destroy

From 90f05b731075ecf01901d13c938dbdb023c11074 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:25:30 +0200
Subject: [PATCH 33/48] But feels more essentially part of the User, so list
 first

---
 app/models/user.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 284de79cf..9e7fdffb8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,11 +1,11 @@
 class User < ApplicationRecord
   include Accessor, Assignee, Role, Transferable
 
+  has_one_attached :avatar
+
   has_many :sessions, dependent: :destroy
   has_secure_password validations: false
 
-  has_one_attached :avatar
-
   has_many :comments, inverse_of: :creator, dependent: :destroy
 
   has_many :notifications, dependent: :destroy

From 5de85fa6bff38c886a9cb2439178228912786f71 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:25:35 -0500
Subject: [PATCH 34/48] Don't display published event in threads

---
 app/models/event_summary.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/models/event_summary.rb b/app/models/event_summary.rb
index fcfaabd83..241d3cc3c 100644
--- a/app/models/event_summary.rb
+++ b/app/models/event_summary.rb
@@ -13,8 +13,6 @@ class EventSummary < ApplicationRecord
 
     def summarize(event)
       case event.action
-      when "published"
-        "Added by #{event.creator.name}."
       when "assigned"
         "Assigned to #{event.assignees.pluck(:name).to_sentence}."
       when "unassigned"

From 7124835e60589088114690e758feb139ee797498 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:29:03 +0200
Subject: [PATCH 35/48] No long transactions!

If you intend to deactivate someone, and the process fails mid process,
so you only delete some sessions, or some accesses, you are actually
fine. The system is never left in an incomplete state. And that's really
the only time we should be using transactions with sqlite3 -- to prevent
actual data integrity issues.

The rest of the time, we should optimize for each transaction to be as
quick as possible. The sqlite3 writer lock is the one bottleneck that we
cant afford to overload.
---
 app/models/user.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 9e7fdffb8..b79fbf606 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,11 +24,9 @@ class User < ApplicationRecord
   end
 
   def deactivate
-    transaction do
-      sessions.delete_all
-      accesses.destroy_all
-      update! active: false, email_address: deactived_email_address
-    end
+    sessions.delete_all
+    accesses.destroy_all
+    update! active: false, email_address: deactived_email_address
   end
 
   private

From 5048e9c9700c45ea85193c50843b6a1440ae8889 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:40:30 +0200
Subject: [PATCH 36/48] Duh, no before destroy commit, but this is still not
 right!

---
 app/models/concerns/filterable.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index e1a11abd8..85a33a015 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -5,10 +5,12 @@ module Filterable
     has_and_belongs_to_many :filters
 
     after_update { filters.touch_all }
-    before_destroy_commit :remove_from_filters
+    before_destroy :remove_from_filters
   end
 
   private
+    # FIXME: This is too inefficient to have part of a destroy transaction.
+    # Need to find a way to use a job or a single query.
     def remove_from_filters
       filters.each { it.resource_removed self }
     end

From 14129326663d357437b7e09b681d1e0815bac770 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:45:39 -0500
Subject: [PATCH 37/48] The placeholder attribute is on the `house-md` element

---
 app/assets/stylesheets/house.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/house.css b/app/assets/stylesheets/house.css
index e1ce84325..66dbdddf1 100644
--- a/app/assets/stylesheets/house.css
+++ b/app/assets/stylesheets/house.css
@@ -1,6 +1,8 @@
 @layer components {
   /* Editor */
   house-md {
+    --placeholder: attr(placeholder);
+
     display: flex;
     flex-direction: column;
     flex-grow: 1;
@@ -65,7 +67,7 @@
     padding: 1rem;
 
     &.house-md-content-empty::before {
-      content: attr(placeholder);
+      content: var(--placeholder);
       color: currentColor;
       opacity: 0.5;
       pointer-events: none;

From 647971f2052d8a9d75f121c9af85d02046337641 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 14:46:46 -0500
Subject: [PATCH 38/48] Remove check for _Added by..._ line

---
 test/models/event_summary_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/models/event_summary_test.rb b/test/models/event_summary_test.rb
index a438c492c..480529b0f 100644
--- a/test/models/event_summary_test.rb
+++ b/test/models/event_summary_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 class EventSummaryTest < ActiveSupport::TestCase
   test "body" do
-    assert_equal "Added by David. Assigned to JZ.", event_summaries(:logo_initial_activity).body
+    assert_equal "Assigned to JZ.", event_summaries(:logo_initial_activity).body
     assert_equal "Assigned to Kevin.", event_summaries(:logo_second_activity).body
     assert_equal "Added by Kevin.", event_summaries(:text_initial_activity).body
   end

From dff55d6cb6f235f379a4d39f52d1f30da7a2d1de Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:48:32 +0200
Subject: [PATCH 39/48] Style

---
 app/models/card.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index 541d761a9..75f8c4807 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,7 +1,6 @@
 class Card < ApplicationRecord
-  include Assignable, Colored, Engageable, Eventable, Golden,
-    Messages, Notifiable, Pinnable, Closeable, Searchable, Staged,
-    Statuses, Taggable, Watchable
+  include Assignable, Colored, Engageable, Eventable, Golden, Messages, Notifiable,
+    Pinnable, Closeable, Searchable, Staged, Statuses, Taggable, Watchable
 
   belongs_to :collection, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }

From 93516f2e483e6d30f46a7c2b085eafd3265a3f7f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:51:38 +0200
Subject: [PATCH 40/48] @collection is always available when card scoped

---
 app/views/cards/assignments/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index 1be2c77a2..35412c9f3 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -2,7 +2,7 @@
   <strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Assign this to…</strong>
 
   <div class="flex flex-column full-width popup__list">
-    <% @card.collection.users.active.alphabetically.each do |user| %>
+    <% @collection.users.active.alphabetically.each do |user| %>
         <%= button_to card_assignments_path(@card, params: { assignee_id: user.id }), method: :post, class: "btn popup__item full-width" do %>
           <span class="overflow-ellipsis"><%= user.name %></span>
           <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @card.assignees.include?(user) %>

From cf3cbccf23bf1042f54cb1aee6faf9eda1ebd6eb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 22 Apr 2025 21:56:23 +0200
Subject: [PATCH 41/48] Indention

---
 app/views/cards/comments/_comment.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/comments/_comment.html.erb b/app/views/cards/comments/_comment.html.erb
index 427fae8ad..bebe522e6 100644
--- a/app/views/cards/comments/_comment.html.erb
+++ b/app/views/cards/comments/_comment.html.erb
@@ -16,7 +16,7 @@
           <% end %>
 
           <%= link_to edit_card_comment_path(comment.card, comment),
-            class: "comment__edit btn btn--plain txt-xx-small fill-transparent translucent flex-item-justify-end" do %>
+                class: "comment__edit btn btn--plain txt-xx-small fill-transparent translucent flex-item-justify-end" do %>
             <%= icon_tag "menu-dots-horizontal" %> <span class="for-screen-reader">Edit this comment</span>
           <% end %>
         </div>

From 537903ba0b5d1bde826680145818a7baa022c268 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 15:06:05 -0500
Subject: [PATCH 42/48] Don't test for _Added by_ events

Note: The join method in `event_summary.rb` inserts a space that we need to account for
---
 test/models/event_summary_test.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/models/event_summary_test.rb b/test/models/event_summary_test.rb
index 480529b0f..84ba368ef 100644
--- a/test/models/event_summary_test.rb
+++ b/test/models/event_summary_test.rb
@@ -2,8 +2,7 @@ require "test_helper"
 
 class EventSummaryTest < ActiveSupport::TestCase
   test "body" do
-    assert_equal "Assigned to JZ.", event_summaries(:logo_initial_activity).body
+    assert_equal " Assigned to JZ.", event_summaries(:logo_initial_activity).body
     assert_equal "Assigned to Kevin.", event_summaries(:logo_second_activity).body
-    assert_equal "Added by Kevin.", event_summaries(:text_initial_activity).body
   end
 end

From 0a9d16bf2d11def175d844a2ff57bfed03446475 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 22:29:33 -0500
Subject: [PATCH 43/48] New menu filters and navigates

---
 app/assets/stylesheets/popup.css              | 67 ++++++++++++++++---
 .../cards/index/_collections_filter.html.erb  | 29 ++++----
 app/views/cards/index/_header.html.erb        |  9 ++-
 app/views/events/_filter.html.erb             |  2 +-
 4 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 5c8ec1b95..f674b25e2 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -5,10 +5,11 @@
     --panel-size: auto;
 
     inline-size: auto;
-    inset: 0 auto auto 0;
+    inset: 0 auto auto 50%;
     min-inline-size: 20ch;
     max-inline-size: 40ch;
     position: absolute;
+    transform: translateX(-50%);
     z-index: 2;
 
     &[open] {
@@ -16,8 +17,19 @@
     }
   }
 
+  .popup__group {
+    background: var(--color-subtle-light);
+    padding-inline-start: var(--inline-space-half);
+    
+    @media (any-hover: hover) {
+      &:hover {
+        background: var(--color-selected);
+      }
+    }
+  }
+
   .popup__item {
-    --btn-background: var(--color-subtle-light);
+    --btn-background: transparent;
     --btn-border-radius: 0.3em;
     --btn-border-size: 0;
     --btn-font-weight: 500;
@@ -37,12 +49,6 @@
 
     }
 
-    @media (any-hover: hover) {
-      &:where(:not(:active):hover) {
-        --btn-background: var(--color-selected);
-      }
-    }
-
     &:has(input:checked)  {
       --btn-background: var(--color-selected);
       --btn-color: var(--color-ink);
@@ -82,3 +88,48 @@
     font-weight: 800;
   }
 }
+
+.popup--animated {
+  --backdrop-speed: 150ms;
+  --panel-size: max-content;
+  --speed: 150ms;
+
+  opacity: 0;
+  transform: scale(0.2) translateX(-50%);
+  transform-origin: top left;
+  transition:
+      display var(--speed) allow-discrete,
+      opacity var(--speed),
+      overlay var(--speed) allow-discrete,
+      transform var(--speed);
+
+  &::backdrop {
+    background-color: var(--color-always-black);
+    opacity: 0;
+    transform: scale(1);
+    transition:
+      display var(--backdrop-speed) allow-discrete,
+      opacity var(--backdrop-speed),
+      overlay var(--backdrop-speed) allow-discrete;
+  }
+
+  &[open] {
+    opacity: 1;
+    transform: scale(1) translateX(-50%);
+
+    &::backdrop {
+      opacity: 0.5;
+    }
+  }
+
+  @starting-style {
+    &[open] {
+      opacity: 0;
+      transform: scale(0.2) translateX(-50%);
+    }
+
+    &[open]::backdrop {
+      opacity: 0;
+    }
+  }
+}
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index b81481ad7..80802f6f8 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -4,20 +4,25 @@
     <%= filter_hidden_field_tag key, value %>
   <% end %>
 
-  <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "btn popup__item" do %>
-    <span class="overflow-ellipsis">All collections</span>
-  <% end %>
-
   <% Current.user.collections.order(:name).each do |collection| %>
-    <div class="btn popup__item">
-      <%= form.check_box "collection_ids[]", {
-            checked: filter.collections.include?(collection),
-            data: { action: "change->form#submit" },
-            include_hidden: false,
-      }, collection.id %>
+    <div class="popup__group flex align-center full-width gap-half">
+      <div class="btn txt-xx-small">
+        <%= form.check_box "collection_ids[]", {
+              checked: filter.collections.include?(collection),
+              data: { action: "change->form#submit" },
+              include_hidden: false,
+        }, collection.id %>
 
-      <%= form.label "collection_ids[]", collection.name, for: dom_id(collection, :filter), class: "overflow-ellipsis" %>
-      <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+        <span class="for-screen-reader">
+          Toggle filter for <%= collection.name %>
+        </span>
+        <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+      </div>
+
+      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item flex-item-grow justify-space-between" do %>
+        <span class="overflow-ellipsis flex-item-grow"><%= collection.name %></span>
+        <span class="translucent"> ›</span>
+      <% end %>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index 0eef62cce..3946e1b2a 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -12,8 +12,13 @@
         </h1>
       </button>
 
-      <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-        <strong class="popup__title margin-block-start-half pad-inline-half">In Collection</strong>
+      <dialog class="events__popup popup popup--animated panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+        <div class="flex align-center full-width gap-half">
+          <span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.6em 0 0.3em;">
+            <%= icon_tag "filter" %>
+          </span>
+          <strong class="popup__title txt-medium">Collections</strong>
+        </div>
 
         <%= render "cards/index/collections_filter", filter: filter %>
       </dialog>
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 94a9a756a..289c86e69 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -8,7 +8,7 @@
 	</button>
 
 	<dialog class="events__popup popup panel flex-column full-width align-start gap-half fill-white shadow"
-				style="z-index: 5; inset: 0 0 auto auto;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+				style="z-index: 5;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
 		<strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Filter by Collection…</strong>
 		<%= form_with url: events_path, method: :get, class: "flex flex-column full-width popup__list",
 					data: { controller: "form" } do |form| %>

From b29afcd518a2eb8503147171dc9316dd6cf9f888 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 22:57:48 -0500
Subject: [PATCH 44/48] Same treatment for the events index

---
 app/assets/stylesheets/events.css             |  7 ++--
 app/assets/stylesheets/popup.css              |  4 ++
 .../cards/index/_collections_filter.html.erb  |  4 +-
 app/views/events/_filter.html.erb             | 39 +++++++++++++------
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 0b19fe853..e4a74f0d4 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -61,9 +61,10 @@
   }
 
   .events__popup {
-    .panel:is(&) {
-      max-block-size: calc(100dvh - (2 * var(--block-space-double)));
-      max-inline-size: calc(100dvw - (2 * var(--block-space-double)));
+    margin-block-start: var(--block-space-double);
+
+    .events__index-header:has(&) {
+      position: relative;
     }
 
     #header:has(&) {
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index f674b25e2..0ffde9dc2 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -19,6 +19,7 @@
 
   .popup__group {
     background: var(--color-subtle-light);
+    max-inline-size: 100%;
     padding-inline-start: var(--inline-space-half);
     
     @media (any-hover: hover) {
@@ -37,7 +38,10 @@
     --hover-size: 0;
     --outline-color: transparent;
 
+    flex: 1 1 auto;
     justify-content: start;
+    max-inline-size: 100%;
+    text-align: start;
 
     &::after {
       border-radius: var(--btn-border-radius);
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index 80802f6f8..2370929c0 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -5,7 +5,7 @@
   <% end %>
 
   <% Current.user.collections.order(:name).each do |collection| %>
-    <div class="popup__group flex align-center full-width gap-half">
+    <div class="popup__group flex align-center gap-half overflow-ellipsis">
       <div class="btn txt-xx-small">
         <%= form.check_box "collection_ids[]", {
               checked: filter.collections.include?(collection),
@@ -19,7 +19,7 @@
         <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
       </div>
 
-      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item flex-item-grow justify-space-between" do %>
+      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item justify-space-between" do %>
         <span class="overflow-ellipsis flex-item-grow"><%= collection.name %></span>
         <span class="translucent"> ›</span>
       <% end %>
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 289c86e69..0b0a41550 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -1,5 +1,5 @@
 <% presenter = CollectionFilterPresenter.new(@collections, params, cookies) %>
-<div class="position-relative max-width margin-block-end-half"
+<div class="max-width margin-block-end-half"
 		data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
 	<button class="events__filter-btn input input--select flex-inline center min-width max-width txt-small" data-action="click->dialog#open:stop">
 		<span class="overflow-ellipsis center">
@@ -7,22 +7,37 @@
 		</span>
 	</button>
 
-	<dialog class="events__popup popup panel flex-column full-width align-start gap-half fill-white shadow"
+	<dialog class="events__popup popup popup--animated panel flex-column full-width align-start gap-half fill-white shadow"
 				style="z-index: 5;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-		<strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Filter by Collection…</strong>
+		<div class="flex align-center full-width gap-half">
+			<span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.6em 0 0.3em;">
+				<%= icon_tag "filter" %>
+			</span>
+			<strong class="popup__title txt-medium">Collections</strong>
+		</div>
+
 		<%= form_with url: events_path, method: :get, class: "flex flex-column full-width popup__list",
 					data: { controller: "form" } do |form| %>
-			<%= link_to "Show everything", events_path(clear_filter: true), class: "btn popup__item txt-nowrap" %>
+			<%#= link_to "Show everything", events_path(clear_filter: true), class: "btn popup__item txt-nowrap" %>
 			<% @collections.each do |collection| %>
-				<div class="btn popup__item">
-					<%= form.check_box "collection_ids[]", {
-						checked: (params[:collection_ids] || cookies[:collection_filter]&.split(","))&.include?(collection.id.to_s),
-						data: { action: "change->form#submit" },
-						include_hidden: false,
-					}, collection.id %>
+				<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+					<div class="btn txt-xx-small">
+						<%= form.check_box "collection_ids[]", {
+							checked: (params[:collection_ids] || cookies[:collection_filter]&.split(","))&.include?(collection.id.to_s),
+							data: { action: "change->form#submit" },
+							include_hidden: false,
+						}, collection.id %>
 
-					<%= form.label "collection_ids[]", collection.name, for: dom_id(collection, :filter), class: "overflow-ellipsis" %>
-					<%= icon_tag "check", class: "checked flex-item-justify-end" %>
+						<span class="for-screen-reader">
+							Toggle filter for <%= collection.name %>
+						</span>
+						<%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+					</div>
+
+					<%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item flex-item-grow justify-space-between" do %>
+						<span class="overflow-ellipsis flex-item-grow"><%= collection.name %></span>
+						<span class="translucent"> ›</span>
+					<% end %>
 				</div>
 			<% end %>
 		<% end %>

From 8fec68c34c85f8d5d78c3d8b49754bc1118947cb Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 23:07:06 -0500
Subject: [PATCH 45/48] Remove index columns

---
 app/assets/stylesheets/events.css |  2 --
 app/assets/stylesheets/popup.css  | 10 ++++++++++
 app/views/events/_filter.html.erb |  8 ++++++++
 app/views/events/index.html.erb   | 26 --------------------------
 4 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index e4a74f0d4..845987fb5 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -11,8 +11,6 @@
     --column-gap: clamp(var(--inline-space), 3cqmin, calc(var(--inline-space) * 3));
     --grid-lines: 0.1rem;
 
-    display: grid;
-    grid-template-columns: 1fr 5fr 1fr;
     margin: auto;
   }
 
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 0ffde9dc2..9cf88b064 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -88,6 +88,16 @@
     row-gap: 2px;
   }
 
+  .popup__new {
+    --btn-icon-size: 1em;
+
+    .icon {
+      margin-inline-end: 0.5em;
+    }
+    
+    padding-inline-start: var(--inline-space-half);
+  }
+
   .popup__title {
     font-weight: 800;
   }
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 0b0a41550..5b8f3f253 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -19,6 +19,14 @@
 		<%= form_with url: events_path, method: :get, class: "flex flex-column full-width popup__list",
 					data: { controller: "form" } do |form| %>
 			<%#= link_to "Show everything", events_path(clear_filter: true), class: "btn popup__item txt-nowrap" %>
+			<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+				<%= link_to new_collection_path, class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+					<%= icon_tag "add" %>
+					<span>Add a new collection</span>
+				<% end %>
+			</div>
+			<hr class="full-width separator--horizontal" style="--border-color: transparent;">
+
 			<% @collections.each do |collection| %>
 				<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
 					<div class="btn txt-xx-small">
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 8bcd35e80..ff113b77b 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -17,36 +17,10 @@
 <% end %>
 
 <div class="events__container align-start gap">
-  <div class="txt-align-start">
-    <h2 class="txt-normal txt-uppercase txt-nowrap">Custom views</h2>
-    <div style="border-block-start: 1px solid var(--color-subtle); padding-block-start: var(--block-space-half);">
-      <% @filters.each do |filter| %>
-        <h3 class="txt-small margin-block-end-half txt-tight-lines">
-          <%= link_to filter.summary, cards_path(**filter.as_params) %>
-        </h3>
-      <% end %>
-    </div>
-  </div>
   <div class="flex flex-column">
     <div id="activity" class="events__index flex flex-column">
       <%= render "events/day", activity_day: @activity_day, next_day: @next_day, events: @events %>
     </div>
     <%= event_next_page_link(@next_day) %>
   </div>
-
-  <div class="txt-align-start">
-    <div class="flex align-start gap min-width" >
-      <h2 class="txt-normal txt-uppercase overflow-ellipsis">Collections</h2>
-      <%= link_to new_collection_path, class: "btn txt-xx-small flex-item-justify-end flex-item-no-shrink", style: "view-transition-name: new-collection" do %>
-        <%= icon_tag "add" %>
-        <span class="for-screen-reader">New</span>
-      <% end %>
-    </div>
-
-    <div style="border-block-start: 1px solid var(--color-subtle); padding-block-start: var(--block-space-half);">
-      <% @collections.each do |collection| %>
-        <h3 class="txt-small margin-block-end-half txt-tight-lines"><%= link_to collection.name, cards_path(collection_ids: [ collection ]) %></h3>
-      <% end %>
-    </div>
-  </div>
 </div>

From 14d0b995a8aaadf8afd6e2811ea9069d5ae65de3 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 22 Apr 2025 23:09:29 -0500
Subject: [PATCH 46/48] Fix summary

---
 app/views/cards/display/common/_meta.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb
index 94c5f477a..9219e44df 100644
--- a/app/views/cards/display/common/_meta.html.erb
+++ b/app/views/cards/display/common/_meta.html.erb
@@ -20,7 +20,8 @@
       Reported by <strong><%= familiar_name_for(card.creator) %></strong>
     </span>
     <span class="card__meta-item card__meta-item--assigned overflow-ellipsis">
-      <%= card.assignees.any? ? card.assignees.map { |assignee| "Assigned to <strong>#{familiar_name_for(assignee)}</strong>" }.to_sentence.html_safe : "Not assigned" %>
+      <%= card.assignees.any? ? "Assigned to" : "Not assigned" %>
+      <%= card.assignees.map { |assignee| "<strong>#{familiar_name_for(assignee)}</strong>" }.to_sentence.html_safe %>
     </span>
   </div>
 

From 23bd8a569e8870b18895d3d2bf561ead31553d6a Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 08:53:43 -0500
Subject: [PATCH 47/48] This is annoying

---
 app/views/cards/taggings/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/cards/taggings/new.html.erb b/app/views/cards/taggings/new.html.erb
index 6ff9f1306..193a1d339 100644
--- a/app/views/cards/taggings/new.html.erb
+++ b/app/views/cards/taggings/new.html.erb
@@ -3,7 +3,7 @@
     <strong class="popup__title margin-block-half pad-inline-half">Tag this…</strong>
 
     <%= form_with url: card_taggings_path(@card), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %>
-      <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %>
+      <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width", autocomplete: "off" %>
       <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %>
         <%= icon_tag "add" %>
         <span class="for-screen-reader">Add a tag</span>

From b3a2c65527a6df61be85fdb4da6c2d05ea55040c Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 23 Apr 2025 09:24:31 -0500
Subject: [PATCH 48/48] Improve layout and truncation

---
 app/assets/stylesheets/events.css             |  6 ----
 app/assets/stylesheets/popup.css              | 32 +++++++++++--------
 app/views/cards/assignments/new.html.erb      |  2 +-
 .../cards/index/_collections_filter.html.erb  | 15 +++++----
 app/views/cards/index/_header.html.erb        |  8 +++--
 app/views/cards/taggings/new.html.erb         |  2 +-
 6 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 845987fb5..219e18292 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -64,12 +64,6 @@
     .events__index-header:has(&) {
       position: relative;
     }
-
-    #header:has(&) {
-      max-inline-size: 100%;
-      position: relative;
-      z-index: 5;
-    }
   }
 
   .event {
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 9cf88b064..b9987e12c 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -1,13 +1,13 @@
 @layer components {
   .popup {
     --panel-border-radius: 0.5em;
-    --panel-padding: 0.4em 0.5em 0.5em;
+    --panel-padding: var(--block-space);
     --panel-size: auto;
 
     inline-size: auto;
     inset: 0 auto auto 50%;
-    min-inline-size: 20ch;
-    max-inline-size: 40ch;
+    min-inline-size: min(20ch, 90vw);
+    max-inline-size: min(50ch, 90vw);
     position: absolute;
     transform: translateX(-50%);
     z-index: 2;
@@ -15,12 +15,22 @@
     &[open] {
       display: flex;
     }
+
+    #header:has(&) {
+      max-inline-size: 100%;
+      position: relative;
+      z-index: 5;
+    }
   }
 
   .popup__group {
     background: var(--color-subtle-light);
     max-inline-size: 100%;
-    padding-inline-start: var(--inline-space-half);
+    padding-inline: var(--inline-space);
+
+    .btn {
+      --btn-background: transparent;
+    }
     
     @media (any-hover: hover) {
       &:hover {
@@ -30,7 +40,7 @@
   }
 
   .popup__item {
-    --btn-background: transparent;
+    --btn-background: var(--color-subtle-light);
     --btn-border-radius: 0.3em;
     --btn-border-size: 0;
     --btn-font-weight: 500;
@@ -43,14 +53,10 @@
     max-inline-size: 100%;
     text-align: start;
 
-    &::after {
-      border-radius: var(--btn-border-radius);
-      border: var(--btn-border-size) solid var(--btn-border-color, var(--color-subtle));
-      content: "";
-      display: block;
-      inline-size: calc(100% - var(--btn-padding) * 2);
-      block-size: calc(100% - var(--btn-padding) * 2);
-
+    @media (any-hover: hover) {
+      &:where(:not(:active):hover) {
+        --btn-background: var(--color-selected);
+      }
     }
 
     &:has(input:checked)  {
diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index 35412c9f3..22c8f9c2d 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -1,5 +1,5 @@
 <%= turbo_frame_tag @card, :assignment do %>
-  <strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Assign this to…</strong>
+  <strong class="popup__title pad-inline-half txt-nowrap">Assign this to…</strong>
 
   <div class="flex flex-column full-width popup__list">
     <% @collection.users.active.alphabetically.each do |user| %>
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index 2370929c0..bd1c77548 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -1,12 +1,12 @@
-<%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
+<%= form_with url: cards_path, method: :get, class: "flex flex-column max-width popup__list",
       data: { controller: "form" } do |form| %>
   <% filter.as_params.except(:collection_ids).each do |key, value| %>
     <%= filter_hidden_field_tag key, value %>
   <% end %>
 
   <% Current.user.collections.order(:name).each do |collection| %>
-    <div class="popup__group flex align-center gap-half overflow-ellipsis">
-      <div class="btn txt-xx-small">
+    <div class="popup__group flex align-center">
+      <div class="btn txt-xx-small flex-item-no-shrink">
         <%= form.check_box "collection_ids[]", {
               checked: filter.collections.include?(collection),
               data: { action: "change->form#submit" },
@@ -16,13 +16,14 @@
         <span class="for-screen-reader">
           Toggle filter for <%= collection.name %>
         </span>
-        <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
+        <%= icon_tag "check", size: 18, class: "checked" %>
       </div>
 
-      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item justify-space-between" do %>
-        <span class="overflow-ellipsis flex-item-grow"><%= collection.name %></span>
-        <span class="translucent"> ›</span>
+      <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width" do %>
+        <span class="overflow-ellipsis"><%= collection.name %></span>
       <% end %>
+  
+      <span class="translucent flex-item-no-shrink"> ›</span>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index 3946e1b2a..46309383b 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -5,19 +5,23 @@
   <div class="btn btn--placeholder flex-item-justify-start"></div>
 
   <header class="flex flex-inline flex-column center flex-shrink">
-    <div class="card-filter--collection flex-inline center position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
+    <div class="card-filter--collection flex-inline center position-relative" data-controller="dialog" data-action="click@document->dialog#closeOnClickOutside">
       <button class="txt-align-center input input--select borderless center txt-medium" data-action="click->dialog#open:stop">
         <h1 class="txt-large overflow-ellipsis margin-none">
           <%= filter_title filter %>
         </h1>
       </button>
 
-      <dialog class="events__popup popup popup--animated panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+      <dialog class="popup popup--animated panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="keydown.esc->dialog#close:stop turbo:before-cache@document->dialog#close">
         <div class="flex align-center full-width gap-half">
           <span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.6em 0 0.3em;">
             <%= icon_tag "filter" %>
           </span>
           <strong class="popup__title txt-medium">Collections</strong>
+          <button class="btn borderless txt-x-small flex-item-justify-end" data-action="click->dialog#close" >
+            <%= icon_tag "remove-med" %>
+            <span class="for-screen-reader">Close</span>
+          </button>
         </div>
 
         <%= render "cards/index/collections_filter", filter: filter %>
diff --git a/app/views/cards/taggings/new.html.erb b/app/views/cards/taggings/new.html.erb
index 193a1d339..e41bcf69d 100644
--- a/app/views/cards/taggings/new.html.erb
+++ b/app/views/cards/taggings/new.html.erb
@@ -1,6 +1,6 @@
 <%= turbo_frame_tag @card, :tagging do %>
   <dialog class="popup panel flex-column align-start justify-start fill-white shadow" data-dialog-target="dialog">
-    <strong class="popup__title margin-block-half pad-inline-half">Tag this…</strong>
+    <strong class="popup__title margin-block-end-half pad-inline-half">Tag this…</strong>
 
     <%= form_with url: card_taggings_path(@card), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %>
       <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width", autocomplete: "off" %>