mastodon/app/models
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
2017-09-09 23:56:21 -05:00
..
concerns Pinned statuses (#4675) 2017-08-25 01:41:18 +02:00
form
…
web Fix WebPush (regression from #4524) (#4778) 2017-09-02 16:50:42 +02:00
account.rb Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
account_domain_block.rb
…
account_filter.rb
…
application_record.rb
…
block.rb
…
context.rb
…
conversation.rb
…
conversation_mute.rb
…
domain_block.rb Allow domain blocks that only reject media without silencing or suspending (#4325) 2017-07-24 14:26:55 +02:00
export.rb
…
favourite.rb
…
feed.rb
…
follow.rb
…
follow_request.rb
…
import.rb Validate data of Imports (#4782) 2017-09-02 20:45:42 +02:00
instance.rb
…
media_attachment.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
mention.rb
…
mute.rb
…
notification.rb
…
preview_card.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
remote_follow.rb rescue HTTP::ConnectionError in RemoteFollowController#create (#4726) 2017-08-28 19:12:09 +02:00
remote_profile.rb
…
report.rb Feat add validation for report comment: characters under 1000 valid (#4833) 2017-09-07 09:55:42 +02:00
report_filter.rb
…
search.rb
…
session_activation.rb Refactor Web::PushSubscription, remove welcome message (#4524) 2017-09-01 13:35:23 +02:00
setting.rb
…
status.rb Fix #4834 - Adjust Status#local and Status#remote scopes (#4839) 2017-09-07 20:18:34 +02:00
status_pin.rb Allow multiple pinned statuses to be shown and make them be ordered b… (#4690) 2017-08-25 18:50:52 +02:00
stream_entry.rb
…
subscription.rb Periodically remove expired PuSH subscribers (#4654) 2017-08-21 22:56:33 +02:00
tag.rb
…
user.rb Use request.remote_ip instead of request.ip (#4744) 2017-08-30 10:24:30 +02:00
web.rb
…