Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.

2022-01-23 18:24:01 +01:00

..

_domain_blocks.html.haml

Add option to obfuscate domain name in public list of domain blocks (#15355)

2020-12-18 08:30:41 +01:00

_login.html.haml

Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)

2022-01-23 15:52:58 +01:00

_registration.html.haml

Add ability to require invite request text (#15326)

2020-12-14 10:03:09 +01:00

more.html.haml

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

2021-07-08 16:17:19 +02:00

show.html.haml

Change number_to_human calls to always use 3-digits precision (#16469)

2021-07-07 21:13:08 +02:00

terms.html.haml

Update /terms and /about/more to use public layout (#8142)

2018-08-09 12:58:20 +02:00