mastodon/spec
Thibaut Girka d445d5833e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
features rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
fixtures Export and import show_reblogs together with following list (#10495) 2019-04-08 07:28:27 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
mailers Add invite request to pending account notification e-mail (#10528) 2019-04-10 00:36:01 +02:00
models Update remote bio test from 160 to 500 (#10799) 2019-05-21 13:29:06 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
requests Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
routing
serializers/activitypub Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
support
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
workers Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
rails_helper.rb Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819) 2019-01-15 23:11:46 +01:00
spec_helper.rb Disable simplecov on CircleCI (#7416) 2018-05-09 16:59:58 +02:00