luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 12:24:31 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
v2 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
web Fix web push notifications for polls (#10864) 2019-05-28 00:26:08 +02:00
base_controller.rb Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00
oembed_controller.rb
proofs_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00