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/helpers
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
..
admin Fix broken admin audit log in whitelist mode (#12303) 2019-11-11 00:05:15 +02:00
settings Set up /settings/keyword_mutes. #164. 2017-10-21 14:54:36 -05:00
accounts_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
application_helper.rb
…
domain_control_helper.rb
…
flashes_helper.rb
…
home_helper.rb
…
instance_helper.rb
…
jsonld_helper.rb
…
routing_helper.rb
…
settings_helper.rb Add kn, mr, ur to available locales (#12379) 2019-11-13 23:36:41 +01:00
statuses_helper.rb Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00