Skip to content

Commit 5c419d8

Browse files
adjogimaadjogima
committed
Merge branch 'mobile-app/scoped-stylesheets' into mobile-app/scoped-stylesheets+edits
* mobile-app/scoped-stylesheets: (82 commits) We can remove ad-hoc handling now that we rely on page refreshes in the card perma Only broadcast when the preview changes, use the _later variant for the broadcast, add tests Update pinned cards when the title changes Rename to be more consistent Beautify board watchers list (#1946) Add missing data-attr on public board Fix hotkey text size on tiny viewports Use buil-in support for :self in Stimulus Save a bunch of invocations on morph events from children elements Fix: memoization was showing stale values when morphing GitHub actions: limit GITHUB_TOKEN permissions (#1933) Validate Identity email address Drop defunct user creation script Golden cards should be placed at the top Animate the column height with a stimulus controller so that it does not depend to the server to update when you D&D mise: respect .ruby-version Support custom validation messages Move css bit to the new blank slates CSS Prevent board names with only spaces and show validation message Keep the column color when D&D cards ...
2 parents a2739fd + 7a5a3c9 commit 5c419d8

File tree

135 files changed

+1063
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+1063
-405
lines changed

‎.github/workflows/ci-checks.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Checks
33
on:
44
pull_request:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
security:
811
name: Security

‎.github/workflows/ci-oss.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
pull_request:
55
types: [opened, synchronize]
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
test:
912
if: github.event.pull_request.head.repo.full_name != github.repository

‎.github/workflows/ci-saas.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: CI (SaaS)
33
on:
44
push:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
test_oss:
811
name: Test (OSS)

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
GH_TOKEN:
1111
required: false
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
test:
1518
name: Tests (${{ matrix.mode }})

‎.mise.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
[settings]
2+
idiomatic_version_file_enable_tools = ["ruby"]
3+
14
[env]
25
PROMETHEUS_EXPORTER_URL = "http://127.0.0.1:9306/metrics"

‎AGENTS.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bin/dev # Start development server (runs on port 3006)
1515
```
1616

1717
Development URL: http://fizzy.localhost:3006
18-
Login with: david@37signals.com (development fixtures), password will appear in the browser console
18+
Login with: david@example.com (development fixtures), password will appear in the browser console
1919

2020
### Testing
2121
```bash
@@ -142,7 +142,7 @@ Key recurring tasks (via `config/recurring.yml`):
142142
### Chrome MCP (Local Dev)
143143

144144
URL: `http://fizzy.localhost:3006`
145-
Login: david@37signals.com (passwordless magic link auth - check rails console for link)
145+
Login: david@example.com (passwordless magic link auth - check rails console for link)
146146

147147
Use Chrome MCP tools to interact with the running dev app for UI testing and debugging.
148148

‎Gemfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ GIT
66

77
GIT
88
remote: https://github.com/rails/rails.git
9-
revision: b22cb0c0cb39b103d816a66d560991acf0a57163
9+
revision: 3c3f6c8a253c8a0f346695374f927c9ab32fbefb
1010
branch: main
1111
specs:
1212
actioncable (8.2.0.alpha)
@@ -216,7 +216,7 @@ GEM
216216
actionview (>= 7.0.0)
217217
activesupport (>= 7.0.0)
218218
jmespath (1.6.2)
219-
json (2.16.0)
219+
json (2.17.1)
220220
jwt (3.1.2)
221221
base64
222222
kamal (2.9.0)
@@ -351,7 +351,7 @@ GEM
351351
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
352352
rainbow (3.1.1)
353353
rake (13.3.1)
354-
rdoc (6.16.0)
354+
rdoc (6.16.1)
355355
erb
356356
psych (>= 4.0.0)
357357
tsort
@@ -443,7 +443,7 @@ GEM
443443
ostruct
444444
stimulus-rails (1.3.4)
445445
railties (>= 6.0.0)
446-
stringio (3.1.8)
446+
stringio (3.1.9)
447447
thor (1.4.0)
448448
thruster (0.1.16)
449449
thruster (0.1.16-aarch64-linux)

‎Gemfile.saas‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ eval_gemfile "Gemfile"
33

44
git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
55

6-
6+
# SaaS-only functionality
77
gem "activeresource", require: "active_resource"
88
gem "queenbee", bc: "queenbee-plugin"
99
gem "fizzy-saas", bc: "fizzy-saas"
10+
gem "console1984", bc: "console1984"
11+
gem "audits1984", bc: "audits1984"
12+
13+
# Telemetry
1014
gem "rails_structured_logging", bc: "rails-structured-logging"
1115
gem "sentry-ruby"
1216
gem "sentry-rails"
13-
14-
# Telemetry
1517
gem "yabeda"
1618
gem "yabeda-actioncable"
1719
gem "yabeda-activejob", github: "basecamp/yabeda-activejob", branch: "bulk-and-scheduled-jobs"

‎Gemfile.saas.lock‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,32 @@
1+
GIT
2+
remote: https://github.com/basecamp/audits1984
3+
revision: c790eaec0716c8df56b3d0ab5bf5d75e3e1b0ed0
4+
specs:
5+
audits1984 (0.1.7)
6+
console1984
7+
importmap-rails (>= 1.2.1)
8+
rinku
9+
rouge
10+
turbo-rails
11+
12+
GIT
13+
remote: https://github.com/basecamp/console1984
14+
revision: 02b1b9ee7fd7050174b6a98c2b43057553621dc4
15+
specs:
16+
console1984 (0.2.2)
17+
irb (~> 1.13)
18+
parser
19+
rails (>= 7.0)
20+
rainbow
21+
122
GIT
223
remote: https://github.com/basecamp/fizzy-saas
3-
revision: 6dd8bb616632edfabc3d814f88f0658d96486e17
24+
revision: 97d126e0a6084905aceaadf4facaa2a48b44e124
425
specs:
526
fizzy-saas (0.1.0)
6-
prometheus-client-mmap
27+
audits1984
28+
console1984
29+
prometheus-client-mmap (~> 1.4.0)
730
queenbee
831
rails (>= 8.1.0.beta1)
932
rails_structured_logging
@@ -367,32 +390,32 @@ GEM
367390
prettyprint
368391
prettyprint (0.2.0)
369392
prism (1.6.0)
370-
prometheus-client-mmap (1.3.0)
393+
prometheus-client-mmap (1.4.0)
371394
base64
372395
bigdecimal
373396
logger
374397
rb_sys (~> 0.9.117)
375-
prometheus-client-mmap (1.3.0-aarch64-linux-gnu)
398+
prometheus-client-mmap (1.4.0-aarch64-linux-gnu)
376399
base64
377400
bigdecimal
378401
logger
379402
rb_sys (~> 0.9.117)
380-
prometheus-client-mmap (1.3.0-aarch64-linux-musl)
403+
prometheus-client-mmap (1.4.0-aarch64-linux-musl)
381404
base64
382405
bigdecimal
383406
logger
384407
rb_sys (~> 0.9.117)
385-
prometheus-client-mmap (1.3.0-arm64-darwin)
408+
prometheus-client-mmap (1.4.0-arm64-darwin)
386409
base64
387410
bigdecimal
388411
logger
389412
rb_sys (~> 0.9.117)
390-
prometheus-client-mmap (1.3.0-x86_64-linux-gnu)
413+
prometheus-client-mmap (1.4.0-x86_64-linux-gnu)
391414
base64
392415
bigdecimal
393416
logger
394417
rb_sys (~> 0.9.117)
395-
prometheus-client-mmap (1.3.0-x86_64-linux-musl)
418+
prometheus-client-mmap (1.4.0-x86_64-linux-musl)
396419
base64
397420
bigdecimal
398421
logger
@@ -440,6 +463,7 @@ GEM
440463
reline (0.6.3)
441464
io-console (~> 0.5)
442465
rexml (3.4.4)
466+
rinku (2.0.6)
443467
rouge (4.6.1)
444468
rqrcode (3.1.0)
445469
chunky_png (~> 1.0)
@@ -610,6 +634,7 @@ PLATFORMS
610634

611635
DEPENDENCIES
612636
activeresource
637+
audits1984!
613638
autotuner
614639
aws-sdk-s3
615640
bcrypt (~> 3.1.7)
@@ -618,6 +643,7 @@ DEPENDENCIES
618643
brakeman
619644
bundler-audit
620645
capybara
646+
console1984!
621647
debug
622648
faker
623649
fizzy-saas!

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ bin/dev
2121

2222
You'll be able to access the app in development at http://fizzy.localhost:3006.
2323

24-
To login, enter `david@37signals.com` and grab the verification code from the browser console to sign in.
24+
To login, enter `david@example.com` and grab the verification code from the browser console to sign in.
2525

2626
### Running tests
2727

0 commit comments

Comments
 (0)