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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
activitypub	…
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 force_login option to OAuth authorize page (#8655)	6 years ago
concerns	Misc. typos (#8694)	6 years ago
oauth	Add force_login option to OAuth authorize page (#8655)	6 years ago
settings	Migrate glitch-soc keyword mutes to Mastodon's	6 years ago
well_known	…
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	…
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	Misc. typos (#8694)	6 years ago
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
home_controller_spec.rb	…
intents_controller_spec.rb	Add remote interaction dialog for toots (#8202)	6 years ago
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
remote_follow_controller_spec.rb	…
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	…
stream_entries_controller_spec.rb	Misc. typos (#8694)	6 years ago
tags_controller_spec.rb	…