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
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	Use Html2Text to generate plaintext for keyword mutes. #236.	2018-02-10 10:36:16 -06:00
web
account.rb
account_domain_block.rb
account_filter.rb	Clean up admin UI for accounts (#6004)	2017-12-13 12:15:10 +01:00
account_moderation_note.rb
admin.rb
application_record.rb	Fix rubocop issues, introduce usage of frozen literal to improve performance	2016-11-15 16:56:29 +01:00
backup.rb	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
block.rb	Cache relationships in API (#6482)	2018-02-18 03:14:46 +01:00
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	Full-text search for authorized statuses (#6423)	2018-02-09 23:04:47 +01:00
feed.rb
follow.rb
follow_request.rb
glitch.rb
home_feed.rb
identity.rb
import.rb	Change belongs_to_required_by_default to true (#5888)	2018-01-19 20:56:47 +01:00
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb	Add invite filter (#5862)	2017-12-01 16:40:02 +01:00
list.rb
list_account.rb
list_feed.rb
media_attachment.rb	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
mention.rb
mute.rb
notification.rb
preview_card.rb
remote_follow.rb
remote_profile.rb
report.rb
report_filter.rb	Admin reports with accounts (#2092)	2017-04-18 19:36:18 +02:00
search.rb
session_activation.rb	Change belongs_to_required_by_default to true (#5888)	2018-01-19 20:56:47 +01:00
setting.rb
site_upload.rb	Fix avatar and header issues by using custom geometry detector (#6515)	2018-02-21 03:40:12 +01:00
status.rb
status_pin.rb
stream_entry.rb
subscription.rb
tag.rb
user.rb
web.rb