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
0158937fc2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Dockerfile
Took upstream version and reverted f13ebd02c9
.
Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
The conflict was due to us raising the number of results returned.
Upstream raised it further, so took it.
- config/locales/de.yml
Took upstream changes to theme translation strings.
- config/locales/gl.yml
Took upstream changes to theme translation strings.
- config/locales/nl.yml
Took upstream changes to theme translation strings.
- config/locales/sk.yml
Took upstream changes to theme translation strings.
6 years ago
..
activitypub
Filter incoming Create activities by relation to local activity ( #10005 )
6 years ago
concerns
…
pubsubhubbub
Remove redundant ( #9503 )
6 years ago
account_search_service.rb
Add type, limit, offset, min_id, max_id, account_id to search API ( #10091 )
6 years ago
after_block_domain_from_account_service.rb
Reduce usage of LD signatures ( #9659 )
6 years ago
after_block_service.rb
…
app_sign_up_service.rb
Add locale param to sign-up API ( #9747 )
6 years ago
authorize_follow_service.rb
Reduce usage of LD signatures ( #9659 )
6 years ago
backup_service.rb
…
base_service.rb
…
batched_remove_status_service.rb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
block_domain_service.rb
…
block_service.rb
Reduce usage of LD signatures ( #9659 )
6 years ago
bootstrap_timeline_service.rb
…
fan_out_on_write_service.rb
…
favourite_service.rb
…
fetch_atom_service.rb
Ignore JSON-LD profile in mime type comparison ( #9179 )
6 years ago
fetch_link_card_service.rb
Ignore low-confidence CharlockHolmes guesses when parsing link cards ( #9510 )
6 years ago
fetch_oembed_service.rb
Fix undefined method error in sidekiq ( #9807 )
6 years ago
fetch_remote_account_service.rb
…
fetch_remote_status_service.rb
…
follow_service.rb
Create Redisable#redis ( #9633 )
6 years ago
hashtag_query_service.rb
Simplify hashtag query service, perf increase for 'any' tags ( #9298 )
6 years ago
import_service.rb
Add option to overwrite imported data ( #9962 )
6 years ago
mute_service.rb
…
notify_service.rb
…
post_status_service.rb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
precompute_feed_service.rb
Fix code style of regeneration-related code ( #9843 )
6 years ago
process_feed_service.rb
…
process_hashtags_service.rb
Add featured hashtags to profiles ( #9755 )
6 years ago
process_interaction_service.rb
…
process_mentions_service.rb
Reduce usage of LD signatures ( #9659 )
6 years ago
reblog_service.rb
…
reject_follow_service.rb
Reduce usage of LD signatures ( #9659 )
6 years ago
remove_status_service.rb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
report_service.rb
Use Contact User as Relay, Report, Subscribe. ( #9661 )
6 years ago
resolve_account_service.rb
Improve admin UI for account view ( #9643 )
6 years ago
resolve_url_service.rb
…
search_service.rb
Add type, limit, offset, min_id, max_id, account_id to search API ( #10091 )
6 years ago
send_interaction_service.rb
…
subscribe_service.rb
…
suspend_account_service.rb
Move sending account Delete to anyone but the account's followers to the pull̀ queue ( #10016 )
6 years ago
unblock_domain_service.rb
…
unblock_service.rb
Reduce usage of LD signatures ( #9659 )
6 years ago
unfavourite_service.rb
…
unfollow_service.rb
Reject existing Follow in addition to sending a Block ( #9811 )
6 years ago
unmute_service.rb
…
unsubscribe_service.rb
…
update_account_service.rb
Error message for avatar image that's too large. #9204 ( #9518 )
6 years ago
update_remote_profile_service.rb
…
verify_link_service.rb
Rescue SSL error in verify link service ( #9914 )
6 years ago
verify_salmon_service.rb
…