You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		6 years ago
..
admin	…
concerns	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
form	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
web	Fix has_one association on Web::PushSubscription (#7767)	7 years ago
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_domain_block.rb	…
account_filter.rb	…
account_moderation_note.rb	…
account_pin.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
admin.rb	…
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	…
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	6 years ago
domain_block.rb	…
email_domain_block.rb	…
export.rb	Show exact number of followers/statuses on export page/in tooltip (#8199)	6 years ago
favourite.rb	Move status counters to separate table, count replies (#8104)	6 years ago
feed.rb	…
follow.rb	Implement Undo { Accept { Follow } } (fixes #8234) (#8245)	6 years ago
follow_request.rb	…
home_feed.rb	…
identity.rb	CAS + SAML authentication feature (#6425)	7 years ago
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	Keyword/phrase filtering (#7905)	6 years ago
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mention.rb	…
mute.rb	…
notification.rb	…
preview_card.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
relay.rb	Expect relays to answer with accept/reject (#8179)	6 years ago
remote_follow.rb	…
remote_profile.rb	…
report.rb	…
report_filter.rb	…
report_note.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
status_pin.rb	…
status_stat.rb	Move status counters to separate table, count replies (#8104)	6 years ago
stream_entry.rb	…
subscription.rb	…
tag.rb	…
trending_tags.rb	Fix number of results returned from TrendingTags.get	6 years ago
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
web.rb	…