imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		2018-02-23 23:28:31 +09:00
..
admin	Change belongs_to_required_by_default to true (#5888)	2018-01-19 20:56:47 +01:00
concerns	New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)	2018-02-23 01:16:17 +01:00
form
glitch
web
account.rb
account_domain_block.rb
account_filter.rb
account_moderation_note.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
admin.rb
application_record.rb
backup.rb
block.rb
context.rb
conversation.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
conversation_mute.rb
custom_emoji.rb
custom_emoji_filter.rb
domain_block.rb
email_domain_block.rb
export.rb
favourite.rb
feed.rb
follow.rb	Cache relationships in API (#6482)	2018-02-18 03:14:46 +01:00
follow_request.rb	Cache relationships in API (#6482)	2018-02-18 03:14:46 +01:00
glitch.rb
home_feed.rb
identity.rb	CAS + SAML authentication feature (#6425)	2018-02-04 05:42:13 +01:00
import.rb
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
list.rb
list_account.rb	Change belongs_to_required_by_default to true (#5888)	2018-01-19 20:56:47 +01:00
list_feed.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
media_attachment.rb
mention.rb
mute.rb
notification.rb	Clear account cache of notification target_status (#6442)	2018-02-08 15:33:23 +01:00
preview_card.rb	Fix avatar and header issues by using custom geometry detector (#6515)	2018-02-21 03:40:12 +01:00
remote_follow.rb
remote_profile.rb
report.rb
report_filter.rb
search.rb
session_activation.rb
setting.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
site_upload.rb
status.rb
status_pin.rb
stream_entry.rb
subscription.rb
tag.rb
user.rb	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
web.rb	Add extended about page stub	2017-01-13 03:24:41 +01:00