Commit Graph

2218 Commits

Author SHA1 Message Date
Kevin McConnell 1f8c6e3561 Default to development-tenant in development 2025-04-24 08:30:16 +01:00
Kevin McConnell 330ac16923 Run Beamer primary on beta as well
Although we aren't currently replicating anywhere there, this allows us
to still capture transactions, and trim the old ones. It also keeps beta
a little closer in configuration to production.
2025-04-24 08:24:45 +01:00
Mike Dalessio e66151112c Merge pull request #430 from basecamp/flavorjones/fix-deploy-migration
dep: update AR::Tenanted to fix production deploy migrations
2025-04-23 23:09:37 -04:00
Mike Dalessio 344e79c06c dep: update AR::Tenanted to fix production deploy migrations 2025-04-23 23:08:27 -04:00
Jason Zimdars 7e3bd75b15 Overflow long menus 2025-04-23 16:43:55 -05:00
Jason Zimdars db5df1a596 Update filter on events screen
- Allow proper sizing
- Bring back All Collections option
2025-04-23 16:39:47 -05:00
Jason Zimdars 4bce7f1b5c Adjust spacing, bring back "All Collections" option 2025-04-23 16:39:47 -05:00
Jason Zimdars 8c51ca391b Move card delete button to a far less prominent position 2025-04-23 16:39:47 -05:00
Jason Zimdars b57f049ae0 Alignment 2025-04-23 16:39:47 -05:00
Jason Zimdars e7f4aaeeaa More breathing room for button 2025-04-23 16:39:47 -05:00
Jason Zimdars 435d89cbe1 Just click to edit directly 2025-04-23 16:39:47 -05:00
Jason Zimdars f9cd725c84 Tighten spacing, improve allignment 2025-04-23 16:39:47 -05:00
Jason Zimdars c595713843 Unnecessary 2025-04-23 16:39:47 -05:00
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