hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec
History
Claire aa832d623a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `CHANGELOG.md`:
  Upstream added newlines.
  Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
  last security update.
  Took upstream's version.
- `app/helpers/context_helper.rb`:
  Conflicts because of extra vocabulary in glitch-soc. The conflicts were
  actually handled in last security merge.
  Kept our version.
 		2022-02-06 15:34:42 +01:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-06 15:34:42 +01:00
fabricators Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
features Add submit button to the top of preferences pages (#13068) 2020-03-08 16:04:03 +01:00
fixtures Fix some link previews being incorrectly generated from other prior links (#16885) 2021-10-21 20:39:35 +02:00
helpers Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428) 2022-02-03 14:09:04 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-01-26 22:32:21 +01:00
mailers Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
presenters Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
requests Further preparation for Rails 6 (#15916) 2021-03-19 02:45:34 +01:00
routing
…
serializers/activitypub
…
services Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
support Fix base64-encoded file uploads not being possible (#12748) 2020-01-04 01:54:07 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-10-13 15:50:24 +02:00
workers Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
rails_helper.rb Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
spec_helper.rb Move rspec examples to tmp dir (#12539) 2019-12-02 19:55:08 +01:00