Thibaut Girka 81e49ba5c6 Merge branch 'master' into glitch-soc/merge-upstream

2020-04-17 20:16:24 +02:00

..

environments

…

initializers

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

2020-04-17 20:16:24 +02:00

locales

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

2020-04-15 17:07:49 +02:00

webpack

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

2020-03-08 19:38:53 +01:00

application.rb

Fix Paperclip using deprecated URI.escape function (#13320)

2020-03-26 15:09:16 +01:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

Bump capistrano from 3.11.2 to 3.12.1 (#13264)

2020-03-18 21:48:03 +09:00

environment.rb

…

i18n-tasks.yml

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

2019-11-20 15:36:09 +01:00

navigation.rb

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

2020-01-24 14:37:06 +01:00

pghero.yml

…

puma.rb

…

routes.rb

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

2020-04-02 20:32:00 +02:00

secrets.yml

…

settings.yml

Merge branch 'master' into glitch-soc/master

2019-12-19 13:52:54 +01:00

sidekiq.yml

…

webpacker.yml

…