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
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
environments
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-28 08:58:32 +01:00
initializers
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-23 18:24:01 +01:00
locales
Fix 0 pluralization for some localization strings (#17576)
2022-02-16 14:57:57 +01:00
locales-glitch
Add link to /about/more to the CAPTCHA verification page
2022-01-26 14:09:11 +01:00
webpack
Add support for multiple source files per pack
2022-02-12 00:10:28 +01:00
application.rb
Add global locale param (#17464)
2022-02-08 02:34:56 +01:00
boot.rb
Bump bootsnap from 1.6.0 to 1.8.1 (#16677)
2021-09-19 14:42:32 +09:00
brakeman.ignore
Add appeals (#17364)
2022-02-14 21:27:53 +01:00
database.yml
config: add DB_SSLMODE for managed/remote PG (#10210)
2019-03-08 14:36:28 +01:00
deploy.rb
Change references to tootsuite/mastodon to mastodon/mastodon (#16491)
2021-07-13 15:46:20 +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 'main' into glitch-soc/merge-upstream
2022-02-17 10:58:44 +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 'main' into glitch-soc/merge-upstream
2022-02-17 10:58:44 +01:00
secrets.yml
Upgrade to Rails 5.0.0.1
2016-08-17 17:58:00 +02:00
settings.yml
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-17 10:58:44 +01:00
sidekiq.yml
Add trending links (#16917)
2021-11-25 13:07:38 +01:00
storage.yml
Update Mastodon to Rails 6.1 (#15910)
2021-03-24 10:44:31 +01:00
webpacker.yml
Do not try to parse gif files as CSS or JS
2019-03-16 14:23:50 +01:00