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.

Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		4 years ago
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
admin	…
announcements	…
apps	…
crypto	Optimize map { ... }.compact calls (#15513)	4 years ago
emails	Add `POST /api/v1/emails/confirmations` to REST API (#15816)	4 years ago
featured_tags	…
instances	Add server rules (#15769)	4 years ago
lists	…
polls	…
push	…
statuses	…
timelines	…
accounts_controller.rb	Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)	4 years ago
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
instances_controller.rb	…
lists_controller.rb	…
markers_controller.rb	Use Rails' index_by where it makes sense (#15542)	4 years ago
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…
trends_controller.rb	…