glitchier-soc/app
Thibaut Girka 1c37ad108c Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
2019-02-10 21:10:09 +01:00
..
chewy Get rid of Chewy order/limit warning (#8355) 2018-08-22 02:44:56 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-01 16:12:20 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
mailers Improve e-mail digest (#9689) 2019-01-02 10:47:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
workers Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00