luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-01 14:48:59 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
webpack Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
application.rb Fix converted media being saved with original extension and mime type (#11130) 2019-06-20 10:52:36 +02:00
boot.rb Fix bootsnap cache directory being declared relatively (#9511) 2018-12-13 05:19:52 +01:00
brakeman.ignore
database.yml
deploy.rb Use the bundled Capistrano version (#9855) 2019-01-18 21:31:11 +01:00
environment.rb
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
puma.rb Improve ActiveRecord connection in on_worker_boot (#9238) 2018-11-09 09:08:01 +01:00
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
secrets.yml
settings.yml Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-03 14:54:30 +02:00
sidekiq.yml
webpacker.yml