mastodon/config
Thibaut Girka bf94a43496 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
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
initializers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
application.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
boot.rb Fix bootsnap cache directory being declared relatively (#9511) 2018-12-13 05:19:52 +01:00
brakeman.ignore Allow joining several hashtags in a single column (#8904) 2018-11-05 18:53:25 +01:00
database.yml Remove PostgreSQL statement timeout (#9537) 2018-12-16 21:17:15 +01:00
deploy.rb Use the bundled Capistrano version (#9855) 2019-01-18 21:31:11 +01:00
environment.rb
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
puma.rb Improve ActiveRecord connection in on_worker_boot (#9238) 2018-11-09 09:08:01 +01:00
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
secrets.yml
settings.yml Enable "displaying application used to post" setting by default (#9994) 2019-02-09 17:33:41 +01:00
sidekiq.yml Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01:00
webpacker.yml Fix building assets in test environment 2018-09-13 15:32:02 +02:00