Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		2020-09-28 14:13:30 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
connection_pool
nodeinfo
ostatus
proof_provider	Fix rubocop warning (#14288)	2020-07-14 19:05:07 +02:00
rss
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
activity_tracker.rb
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
exceptions.rb	Fix movie width and frame_rate returning nil (#14357)	2020-07-19 22:28:27 +02:00
extractor.rb
fast_geometry_parser.rb
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-08 16:26:47 +02:00
formatter.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-01 17:02:18 +02:00
hash_object.rb
inline_renderer.rb
language_detector.rb
potential_friendship_tracker.rb
proof_provider.rb
rate_limiter.rb
request.rb	Add environment variable to allow requests to some private addresses (#14722)	2020-09-26 20:57:39 +02:00
request_pool.rb
response_with_limit.rb
rss_builder.rb
sanitize_config.rb
search_query_parser.rb
search_query_transformer.rb
sidekiq_error_handler.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
spam_check.rb
status_filter.rb
status_finder.rb
tag_manager.rb
themes.rb
toc_generator.rb
user_settings_decorator.rb
webfinger_resource.rb