tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Thibaut Girka 2cfa142961 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes.
2020-08-01 20:24:23 +02:00
..
environments
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-15 15:32:40 +02:00
initializers
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-07 15:58:45 +02:00
locales
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
locales-glitch
Add support for setting Content Warning for CW-less outgoing toots
2020-05-30 18:27:00 +02:00
webpack
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-09 10:39:20 +02:00
application.rb
Add color extraction for audio thumbnails (#14209)
2020-07-05 18:28:25 +02:00
boot.rb
Fix bootsnap cache directory being declared relatively (#9511)
2018-12-13 05:19:52 +01:00
brakeman.ignore
Add E2EE API (#13820)
2020-06-02 19:24:53 +02: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.14.0 to 3.14.1 (#14037)
2020-06-17 06:31:30 +02: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
2020-07-01 19:23:14 +02:00
navigation.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-24 14:37:06 +01:00
pghero.yml
Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)
2020-05-04 13:52:41 +02: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-07-15 15:32:40 +02:00
secrets.yml
Upgrade to Rails 5.0.0.1
2016-08-17 17:58:00 +02:00
settings.yml
Add support for setting Content Warning for CW-less outgoing toots
2020-05-30 18:27:00 +02: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