mastodon-docker-playground/spec
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +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-03-28 13:01:33 +01:00
mailers Add invite request to pending account notification e-mail (#10528) 2019-04-10 00:36:01 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +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-04-08 15:57:56 +02:00
support Remove empty strings (#5732) 2017-11-17 10:52:30 +09:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +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