..
environments
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
initializers
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-24 14:37:06 +01:00
locales
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-27 15:46:50 +01:00
webpack
Revert CircleCI and some webpack changes to match upstream
2019-11-20 18:05:24 +01:00
application.rb
Add kabyle language to Mastodon ( #12962 )
2020-01-26 14:42:35 +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
config: add DB_SSLMODE for managed/remote PG ( #10210 )
2019-03-08 14:36:28 +01:00
deploy.rb
Bump capistrano from 3.11.1 to 3.11.2 ( #12012 )
2019-10-04 11:11:36 +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
Use override_csp options on pghero ( #12489 )
2019-11-27 05:28:11 +01:00
puma.rb
Add PERSISTENT_TIMEOUT option ( #11756 )
2019-09-04 20:44:08 +02:00
routes.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-27 15:46:50 +01:00
secrets.yml
…
settings.yml
Merge branch 'master' into glitch-soc/master
2019-12-19 13:52:54 +01:00
sidekiq.yml
Change trending hashtags to not disappear instantly after midnight ( #11712 )
2019-09-02 18:11:13 +02:00
webpacker.yml
Do not try to parse gif files as CSS or JS
2019-03-16 14:23:50 +01:00
c56a504d11