Claire ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream ...

Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.

2023-10-08 17:21:12 +02:00

..

challenges

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

confirmations

Fix CAPTCHA page not following design pattern of sign-up flow (#25395)

2023-06-13 22:30:40 +02:00

passwords

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

registrations

Fix haml-lint Rubocop Rails/* cops (#26042)

2023-10-03 15:00:40 +02:00

sessions

Merge branch 'main' into glitch-soc/merge-upstream

2023-03-16 23:12:59 +01:00

setup

Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream

2023-08-12 09:36:38 +02:00

shared

Add progress indicator to sign-up flow (#24545)

2023-04-16 07:01:24 +02:00