Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb

2018-10-01 12:43:20 +02:00

..

environments

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

initializers

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

locales

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

webpack

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

application.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-11 16:51:26 +02:00

boot.rb

Adjust bootsnap configuration for newer version (#8826)

2018-09-29 18:34:36 +02:00

brakeman.ignore

Add animate custom emoji param to embed pages (#8507)

2018-08-30 23:14:01 +02:00

database.yml

use-DB_NAME-in-development (#5430)

2017-10-17 11:45:37 +02:00

deploy.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

i18n-tasks.yml

Ignore tootsuite-specific theme-related translation strings

2018-05-10 00:03:34 +02:00

navigation.rb

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +02:00

puma.rb

Revert "Default puma to running on localhost only." (#8444)

2018-08-26 00:13:22 +02:00

routes.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

secrets.yml

…

settings.yml

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

sidekiq.yml

Add nginx and systemd templates (#8770)

2018-09-24 16:46:05 +02:00

webpacker.yml

Fix building assets in test environment

2018-09-13 15:32:02 +02:00