FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app
History
Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
 		2020-01-04 23:04:42 +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 2020-01-04 23:04:42 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
mailers Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
middleware Fix uncaught query param encoding errors (#12741) 2020-01-02 17:14:58 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
policies
…
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-11-30 17:29:44 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +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 2020-01-04 23:04:42 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00