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 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.		6 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	rubocop issues - Cleaning up (#8912)	6 years ago
fixtures	Fix undefined method error in sidekiq (#9807)	6 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	Improve e-mail digest (#9689)	6 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
requests	Redesign landing page (#10232)	6 years ago
routing	…
serializers/activitypub	Improved remote thread fetching (#10106)	6 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	Improved remote thread fetching (#10106)	6 years ago
rails_helper.rb	Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)	6 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago