Thibaut Girka 24822eca73 Revert "Add database statement timeout of 60s (#9382)" ...

This reverts commit 58a29db99d410771f62ffb9e8c2ce95e1d3cb4ae.

2018-12-06 14:39:04 +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-02 20:29:14 +01:00

locales

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

2018-12-01 21:00:16 +01: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

Allow joining several hashtags in a single column (#8904)

2018-11-05 18:53:25 +01:00

database.yml

Revert "Add database statement timeout of 60s (#9382)"

2018-12-06 14:39:04 +01:00

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

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-10-22 17:51:38 +02:00

secrets.yml

…

settings.yml

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

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

sidekiq.yml

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

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

webpacker.yml

Fix building assets in test environment

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