3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon-docker-playground/spec
History
Claire 29b5c5f483 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.
 		2021-09-30 00:01:20 +02:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-09-26 18:28:59 +02:00
fabricators Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
features Add submit button to the top of preferences pages (#13068) 2020-03-08 16:04:03 +01:00
fixtures Switch from unmaintained paperclip to kt-paperclip (#16724) 2021-09-29 23:52:36 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-09-26 18:28:59 +02:00
mailers Add Ruby 3.0 support (#16046) 2021-05-06 14:22:54 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-09-30 00:01:20 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +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 Fix account URI in UpdatePollSerializer (#11194) 2019-06-27 19:41:55 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-09-02 10:52:09 +02: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 2021-04-20 12:17:14 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
workers Fix followers synchronization mechanism not working when URI has empty path (#16510) 2021-08-11 17:48:42 +02: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