You cannot 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 ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		5 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
concerns	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
well_known	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_follow_controller.rb	Add specific rate limits for posting and following (#13172)	5 years ago
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
custom_css_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	6 years ago
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	6 years ago
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
instance_actors_controller.rb	Add outbox attribute to instance actor (#14721)	5 years ago
intents_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	6 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
manifests_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	6 years ago
media_controller.rb	Fix embedded player	5 years ago
media_proxy_controller.rb	Fix media attachments enumeration (#14254)	5 years ago
public_timelines_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago