tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
This commit is contained in:
Thibaut Girka
2018-12-23 11:28:28 +01:00
parent 1a3088364f e25947db4a
commit 3e686beaea
168 changed files with 2873 additions and 1871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/initializers/delivery_job.rb Normal file
View File

@@ -0,0 +1,3 @@
ActionMailer::DeliveryJob.class_eval do
discard_on ActiveJob::DeserializationError
end