me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/spec
History
Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.
2021-02-12 10:28:32 +01:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-02-03 17:02:48 +01:00
fabricators Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
features Add submit button to the top of preferences pages (#13068) 2020-03-08 16:04:03 +01:00
fixtures Add import/export feature for bookmarks (#14956) 2020-11-19 17:48:13 +01: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-02-12 10:28:32 +01:00
mailers refactor: add email previews for WebAuthn emails (#14658) 2020-08-25 01:21:11 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-02-03 17:02:48 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
requests Fix localization test failing due to order of locale definitions (#12393) 2019-11-15 21:00:09 +01:00
routing Move create/destroy actions for api/v1/statuses to namespace (#3678) 2017-06-10 09:39:26 +02:00
serializers/activitypub Fix account URI in UpdatePollSerializer (#11194) 2019-06-27 19:41:55 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-12-23 01:47:45 +01:00
support Fix base64-encoded file uploads not being possible (#12748) 2020-01-04 01:54:07 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-08-13 22:17:29 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
workers Fix being able to import more than allowed number of follows (#15384) 2020-12-26 23:52:46 +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