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 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		6 years ago
..
activitypub	Use raw status code on have_http_status (#7214)	7 years ago
admin	Add confirmation step to account suspensions (#8353)	6 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth	Add missing tests for confirmations controller (#7866)	7 years ago
concerns	Update Rails (#8141)	6 years ago
oauth	Ensure push subscription is immediately removed when application is revoked (#7548)	7 years ago
settings	Migrate glitch-soc keyword mutes to Mastodon's	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	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
authorize_interactions_controller_spec.rb	Add remote interaction dialog for toots (#8202)	6 years ago
emojis_controller_spec.rb	Add a test for emojis_controller (#7652)	7 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	Fix tests for invites controller (regression from 4d81809f36) (#7597)	7 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_unfollows_controller_spec.rb	Add tests for remote_unfollows_controller (#7879)	7 years ago
shares_controller_spec.rb	Add tests for shares_controller (#7835)	7 years ago
statuses_controller_spec.rb	Paginate descendant statuses in public page (#7148)	7 years ago
stream_entries_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
tags_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago