Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.		2019-03-16 14:14:20 +01:00
..
admin	Add specs for action log helper (#9605)	2019-03-16 00:57:23 +09:00
settings
application_helper_spec.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
flashes_helper_spec.rb	Spec FlashesHelper (#3414)	2017-05-29 18:03:02 +02:00
home_helper_spec.rb
instance_helper_spec.rb
jsonld_helper_spec.rb	Add pending specs for jsonld helper (#9750)	2019-01-08 12:18:27 +09:00
routing_helper_spec.rb
settings_helper_spec.rb
stream_entries_helper_spec.rb