masto-fe/app
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
..
chewy Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041) 2019-10-02 20:04:46 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
mailers Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
validators Increase poll option length limit to 100 chars, number of options to 5 2019-10-10 20:13:59 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
workers Merge tag 'v3.0.0' into glitch-soc/merge-upstream 2019-10-04 19:49:43 +02:00