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

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

2018-12-23 11:28:28 +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

2018-12-23 11:28:28 +01:00

locales

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

2018-12-23 11:28:28 +01:00

webpack

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

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

application.rb

…

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

…

environment.rb

…

i18n-tasks.yml

…

navigation.rb

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

2018-12-09 16:08:04 +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

2018-12-23 11:28:28 +01:00

secrets.yml

…

settings.yml

Add admin setting to disable followers count

2018-12-20 14:51:12 +01:00

sidekiq.yml

Track historical space stats in PgHero to determine PostgreSQL growth (#8906)

2018-10-09 19:35:14 +02:00

webpacker.yml

…