Commit Graph

2205 Commits

Author SHA1 Message Date
Jorge Manrubia d2237c2a68 Remove trace 2025-04-23 23:19:38 +02:00
Mike Dalessio 04cebc0b7c Merge pull request #429 from basecamp/flavorjones/dep-artenanted-31aefd06
dep: update active_record-tenanted
2025-04-23 16:53:26 -04:00
Mike Dalessio 6ae00d12cd dep: update active_record-tenanted
to a version that preserves current tenant across console reloads in development
2025-04-23 16:52:14 -04:00
Mike Dalessio a221b0c60a Merge pull request #428 from basecamp/flavorjones/better-database-tasks
dep: update AR::Tenanted to get slightly improved database tasks
2025-04-23 15:50:12 -04:00
Mike Dalessio 93cec7beb9 Update to latest AR::Tenanted to pick up some db task improvements
Notably, `db:migrate` will run tenanted database migrations in
production now.
2025-04-23 15:47:46 -04:00
Mike Dalessio ea56968c05 Remove "primary_original" database
which was created to perform the tenanting migration from 300dffd3,
and can now be cleaned up.
2025-04-23 15:39:50 -04:00
Mike Dalessio 772e79cb80 Merge pull request #427 from basecamp/flavorjones/dep-rails-0ed3cd46
dep: update rails to 0ed3cd46
2025-04-23 14:10:33 -04:00
Mike Dalessio 54375e8ded Re-dump the schema cache file
using the latest Rails version, which means we should have less churn
in the file going forward.
2025-04-23 14:09:40 -04:00
Mike Dalessio 28ce005e8a dep: update rails to 0ed3cd46
which includes the fix for a stable schema cache file.
2025-04-23 14:06:44 -04:00
Jorge Manrubia 646e4a59bc Fix missing variable name 2025-04-23 18:45:55 +02:00
Jorge Manrubia 71c20f9685 FIx migration 2025-04-23 18:45:45 +02:00
Jorge Manrubia 12303dc4d9 Merge pull request #425 from basecamp/plain-text-mentions
Plain text mentions
2025-04-23 17:45:16 +02:00
Jorge Manrubia 3793718e72 Fix concern I lost during merge 2025-04-23 17:25:36 +02:00
Jorge Manrubia bd5a41a0a1 Refresh migrations 2025-04-23 17:25:11 +02:00
Jorge Manrubia b08326ccbe Merge branch 'main' into plain-text-mentions
* main: (48 commits)
  Improve layout and truncation
  This is annoying
  Fix summary
  Remove index columns
  Same treatment for the events index
  New menu filters and navigates
  Don't test for _Added by_ events
  Indention
  @collection is always available when card scoped
  Style
  Remove check for _Added by..._ line
  The placeholder attribute is on the `house-md` element
  Duh, no before destroy commit, but this is still not right!
  No long transactions!
  Don't display published event in threads
  But feels more essentially part of the User, so list first
  Not related to the other two
  Missing controller
  Style
  Errant `bubbles` => `cards` replacement
  ...

# Conflicts:
#	app/models/card.rb
#	app/models/user.rb
#	db/schema.rb
#	db/schema_cache.yml
2025-04-23 17:24:01 +02:00
Jorge Manrubia 2545604659 Add tests 2025-04-23 17:20:04 +02:00
Jason Zimdars b3a2c65527 Improve layout and truncation 2025-04-23 09:24:31 -05:00
Jorge Manrubia 5749ad77e5 Rename classes 2025-04-23 16:19:50 +02:00
Jorge Manrubia f258b05b23 Delegate target to the notifiable objects 2025-04-23 16:19:50 +02:00
Jorge Manrubia 5dac14ab50 Move logic to the model 2025-04-23 16:06:20 +02:00
Jason Zimdars 23bd8a569e This is annoying 2025-04-23 08:53:43 -05:00
Jorge Manrubia 970a51db28 No need for it! 2025-04-23 15:49:22 +02:00
Jorge Manrubia b4cfd40a2f Inline, no need to duplicate the conditional 2025-04-23 15:37:28 +02:00
Jorge Manrubia 6f98f2f573 Order methods 2025-04-23 15:32:22 +02:00
Jorge Manrubia e964c5f9c9 Not used! 2025-04-23 15:31:26 +02:00
Jorge Manrubia 53eba9bd0b Favor after_create_commit to keep transactions fast 2025-04-23 15:28:28 +02:00
Jorge Manrubia ea66845e71 There is always an action 2025-04-23 15:27:58 +02:00
Jorge Manrubia e8e95bd511 Use it 2025-04-23 15:27:25 +02:00
Jorge Manrubia 4bef466df2 1-line 2025-04-23 15:22:41 +02:00
Jorge Manrubia ad58de9e76 Remove access checks when watching
https://github.com/basecamp/fizzy/pull/425#discussion_r2056039581
2025-04-23 15:22:18 +02:00
Jorge Manrubia a9df2d48d1 Remove delegate 2025-04-23 15:17:51 +02:00
Jorge Manrubia 6ff9f7a154 Fix identation 2025-04-23 15:07:02 +02:00
Jorge Manrubia 469fb9f049 Simplify the logic to determine action text changes 2025-04-23 15:02:31 +02:00
Jorge Manrubia e446080367 Don't create duplicated mentions
E.g: when editing a comment or description with a mention
2025-04-23 14:45:56 +02:00
Jorge Manrubia f43629f849 Format 2025-04-23 14:39:10 +02:00
Jorge Manrubia dc5f64ab30 Remove redundant default queue declaration 2025-04-23 14:37:09 +02:00
Jorge Manrubia ab73417e73 Leverage existing resolve route for comments 2025-04-23 14:34:59 +02:00
Jorge Manrubia 07d3447e7e Resolve notifications URLs 2025-04-23 14:34:59 +02:00
Jorge Manrubia 2eae58725a Remove notifications' resource relationship
Is confusing since "source" already captures the origin of the notifications. It's
needed to interpret things at rendering time, so we can query things as needed there.
2025-04-23 13:52:47 +02:00
Jorge Manrubia 696732a90a Rename mentions' container => source 2025-04-23 13:41:34 +02:00
Jorge Manrubia 7c0aff0680 Don't indent case 2025-04-23 13:36:39 +02:00
Jorge Manrubia 043230394e Tidy up event helper code
Also, revert to using a helper method to determine the event action, since this is purely a view concern. Keep method at the event model to identify initial assignments.
2025-04-23 13:35:09 +02:00
Jorge Manrubia 2e3ffcfb9d Remove identation 2025-04-23 13:35:08 +02:00
Jorge Manrubia 755c9b45c7 Rename and fix problem where after_touch was overriding the saved content 2025-04-23 12:38:33 +02:00
Jorge Manrubia edcc9e3279 Add mentionees as watchers 2025-04-23 12:38:06 +02:00
Jorge Manrubia 8ebb3f2fa9 We need to remember on after_touch so that the mechanism triggers when touch-cascading records automatically via associations 2025-04-23 11:38:34 +02:00
Jorge Manrubia 8b6cfccded Rename to clarify usage 2025-04-23 11:20:33 +02:00
Jorge Manrubia ab54cafd84 Inline event notifiers 2025-04-23 11:06:43 +02:00
Jorge Manrubia b510ca0318 Don't choke for nil values 2025-04-23 10:56:00 +02:00
Jorge Manrubia 68e2e96076 Fix indentation 2025-04-23 10:44:42 +02:00