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

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
This commit is contained in:
David Yip
2018-01-19 15:22:10 -06:00
parent 2b2de41bc7 0b888acfd4
commit 2ca965c704
90 changed files with 375 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/media_attachment.rb
View File

@@ -62,8 +62,8 @@ class MediaAttachment < ApplicationRecord
},
}.freeze
belongs_to :account, inverse_of: :media_attachments
belongs_to :status, inverse_of: :media_attachments
belongs_to :account, inverse_of: :media_attachments, optional: true
belongs_to :status, inverse_of: :media_attachments, optional: true
has_attached_file :file,
styles: ->(f) { file_styles f },