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

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.

2019-03-05 19:23:16 +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

2019-02-15 18:02:45 +01:00

locales

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

2019-03-05 19:23:16 +01:00

webpack

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

2019-01-02 15:36:53 +01:00

application.rb

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

2019-02-26 17:04:44 +01:00

boot.rb

Fix bootsnap cache directory being declared relatively (#9511)

2018-12-13 05:19:52 +01:00

brakeman.ignore

Add type, limit, offset, min_id, max_id, account_id to search API (#10091)

2019-02-26 15:21:36 +01:00

database.yml

Remove PostgreSQL statement timeout (#9537)

2018-12-16 21:17:15 +01:00

deploy.rb

Use the bundled Capistrano version (#9855)

2019-01-18 21:31:11 +01:00

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

i18n-tasks.yml

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

2019-02-10 21:10:09 +01:00

navigation.rb

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

2019-02-10 21:10:09 +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

2019-03-05 19:23:16 +01:00

secrets.yml

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

settings.yml

Enable "displaying application used to post" setting by default (#9994)

2019-02-09 17:33:41 +01:00

sidekiq.yml

Add scheduled statuses (#9706)

2019-01-05 12:43:28 +01:00

webpacker.yml

Fix building assets in test environment

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