1
0
puyopuyotetr.is/app
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
..
chewy Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
mailers Fix error in AdminMailer#new_pending_account (#10264) 2019-03-14 14:20:22 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 11:29:06 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00