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 ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code
 		2019-11-20 15:36:09 +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-11-20 15:36:09 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +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-11-20 15:36:09 +01:00
policies
…
presenters Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
serializers Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +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-11-06 14:38:28 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-11-07 13:43:56 +01:00