Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

2019-06-10 18:59:53 +02:00

..

activitypub

…

admin

…

api

…

auth

…

concerns

…

oauth

…

settings

…

well_known

…

about_controller_spec.rb

…

account_follow_controller_spec.rb

…

account_unfollow_controller_spec.rb

…

accounts_controller_spec.rb

…

application_controller_spec.rb

…

authorize_interactions_controller_spec.rb

…

emojis_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

home_controller_spec.rb

…

intents_controller_spec.rb

…

invites_controller_spec.rb

…

manifests_controller_spec.rb

…

media_controller_spec.rb

…

relationships_controller_spec.rb

…

remote_follow_controller_spec.rb

…

remote_interaction_controller_spec.rb

…

remote_unfollows_controller_spec.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

shares_controller_spec.rb

…

statuses_controller_spec.rb

…

stream_entries_controller_spec.rb

…

tags_controller_spec.rb

Redesign public hashtag page to use a masonry layout (#9822)

2019-01-16 19:47:46 +01:00