luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-04 04:24:26 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/serializers
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
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
rss Add an RSS feed tagged to a public profile page (#10502) 2019-08-18 20:54:36 +02:00
web
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
manifest_serializer.rb Add method and enctype to manifest (#11767) 2019-09-05 15:51:51 +02:00
oembed_serializer.rb Add allowfullscreen attribute to oembed iframe (#10370) 2019-03-25 15:01:09 +01:00
webfinger_serializer.rb Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00