glitch-social/spec/controllers/settings
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
..
exports Remove exports/base controller in favor of shared concern (#3444) 2017-05-30 19:06:01 +02:00
two_factor_authentication Lint pass (#8876) 2018-10-04 12:36:53 +02:00
applications_controller_spec.rb lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
deletes_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
exports_controller_spec.rb Add spec for Settings::ExportsController#create (#9512) 2018-12-13 02:53:52 +01:00
flavours_controller_spec.rb Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
imports_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
migrations_controller_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
notifications_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
preferences_controller_spec.rb Change language opt-out to language opt-in (#7823) 2018-06-17 13:54:02 +02:00
profiles_controller_spec.rb Error message for avatar image that's too large. #9204 (#9518) 2018-12-14 05:07:21 +01:00
sessions_controller_spec.rb Add missing tests for sessions controller (#7744) 2018-06-06 10:23:22 +09:00
two_factor_authentications_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00