Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		2021-11-26 22:53:55 +01:00
..
actions	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
components	Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060)	2021-11-26 22:04:09 +01:00
containers	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
features	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-06 00:15:38 +01:00
middleware
reducers	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
selectors
service_worker	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
storage
store
utils	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
api.js	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
base_polyfills.js
blurhash.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-30 00:42:52 +02:00
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js