Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream

2018-10-07 19:47:56 +02:00

..

environments

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

2018-10-05 15:23:57 +02:00

initializers

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

2018-10-05 15:23:57 +02:00

locales

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

2018-10-07 19:47:56 +02:00

webpack

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

2018-10-07 19:47:56 +02:00

application.rb

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

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

boot.rb

Lint pass (#8876)

2018-10-04 12:36:53 +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

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

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

environment.rb

…

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

lint pass 2 (#8878)

2018-10-04 17:38:04 +02:00

routes.rb

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

2018-10-07 19:47:56 +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