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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		6 years ago
..
admin	Add moderation warnings (#9519)	6 years ago
concerns	…
form	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
web	…
account.rb	…
account_conversation.rb	…
account_domain_block.rb	…
account_filter.rb	…
account_identity_proof.rb	…
account_moderation_note.rb	…
account_pin.rb	…
account_stat.rb	…
account_tag_stat.rb	…
account_warning.rb	…
account_warning_preset.rb	…
admin.rb	…
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	Thread scopes through #matches?. #454.	7 years ago
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	Make custom emoji domains case insensitive #9351 (#9474)	6 years ago
custom_emoji_filter.rb	…
custom_filter.rb	…
domain_block.rb	…
email_domain_block.rb	…
export.rb	Export and import show_reblogs together with following list (#10495)	6 years ago
favourite.rb	…
featured_tag.rb	…
feed.rb	…
follow.rb	…
follow_request.rb	…
home_feed.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
identity.rb	Change identities id column to a bigint (#9371)	6 years ago
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
media_attachment.rb	…
mention.rb	…
mute.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
notification.rb	…
poll.rb	…
poll_vote.rb	…
preview_card.rb	…
relay.rb	…
remote_follow.rb	…
remote_profile.rb	…
report.rb	…
report_filter.rb	…
report_note.rb	…
scheduled_status.rb	…
search.rb	…
session_activation.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
setting.rb	…
site_upload.rb	Improvements to image upload validation and creation (#10431)	6 years ago
status.rb	Add support for HTML-formatted toots	6 years ago
status_pin.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
status_stat.rb	Reset status cache when status_stat or media_attachment updates (#9119)	6 years ago
stream_entry.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
subscription.rb	…
tag.rb	…
tombstone.rb	…
trending_tags.rb	…
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
user_invite_request.rb	…
web.rb	Add extended about page stub	8 years ago