luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-02 11:33:36 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
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
..
assets
devise
generators
json_ld Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316) 2019-07-28 13:48:43 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
paperclip Fix converted media being saved with original extension and mime type (#11130) 2019-06-20 10:52:36 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
templates
cli.rb Add tootctl preview_cards remove (#11320) 2019-07-28 13:48:19 +02:00