Thibaut Girka 24d05c7a50 Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 14:36:06 +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

Fix requirie bootsnap (#8836)

2018-10-01 14:06:40 +02:00

brakeman.ignore

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

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

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

…

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