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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		6 years ago
..
activitypub	Add specs for activitypub collections controller (#9484)	6 years ago
admin	Add spec for Admin::ActionLogsController#index (#9522)	6 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth	fix: Execute PAM authentication tests on CircleCI (#9029)	6 years ago
concerns	Add spec for AccountableConcern#log_action (#9559)	6 years ago
oauth	Add force_login option to OAuth authorize page (#8655)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
well_known	Serialize webfinger XML with Ox instead of Nokogiri (#7319)	7 years ago
about_controller_spec.rb	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
account_follow_controller_spec.rb	Cover AccountFollowController more in spec (#3227)	8 years ago
account_unfollow_controller_spec.rb	Cover AccountUnfollowController more in spec (#3228)	8 years ago
accounts_controller_spec.rb	Lint pass (#8876)	6 years ago
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
authorize_interactions_controller_spec.rb	Optimize the process of following someone (#9220)	6 years ago
emojis_controller_spec.rb	Misc. typos (#8694)	6 years ago
follower_accounts_controller_spec.rb	Add tests for followers_accounts_controller (#7794)	7 years ago
following_accounts_controller_spec.rb	Add tests for following accounts controller (#7800)	7 years ago
home_controller_spec.rb	Redirect from Web tag timeline to public tag timeline if not signed in (#6633)	7 years ago
intents_controller_spec.rb	Add remote interaction dialog for toots (#8202)	6 years ago
invites_controller_spec.rb	Lint pass (#8876)	6 years ago
manifests_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
media_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
remote_follow_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
remote_interaction_controller_spec.rb	Add specs for RemoteInteractionController (#9524)	6 years ago
remote_unfollows_controller_spec.rb	Lint pass (#8876)	6 years ago
shares_controller_spec.rb	Add tests for shares_controller (#7835)	7 years ago
statuses_controller_spec.rb	Fix thread depth computation in statuses_controller (#9426)	6 years ago
stream_entries_controller_spec.rb	Misc. typos (#8694)	6 years ago
tags_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago