monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/config
History
Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.
 		2021-03-02 12:06:58 +01:00
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2020-07-15 15:32:40 +02:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2021-03-02 12:06:58 +01:00
locales Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803) 2021-03-01 04:59:13 +01:00
locales-glitch Glitchsoc translation to 'es' language (#1439) 2020-10-19 22:17:29 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
application.rb Drop dependency on secure_headers, fix response headers (#15712) 2021-02-11 23:47:05 +01:00
boot.rb Add clean error message when RAILS_ENV is unset (#15381) 2020-12-20 18:05:03 +01:00
brakeman.ignore Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +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.14.1 to 3.15.0 (#15537) 2021-01-18 11:10:23 +09: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 2021-02-22 15:23:46 +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 2021-03-02 12:06:58 +01:00
secrets.yml Upgrade to Rails 5.0.0.1 2016-08-17 17:58:00 +02:00
settings.yml Change default site title to not point to dev.glitch.social 2021-01-27 14:45:45 +01:00
sidekiq.yml Fix to isolate the sidekiq process that runs the scheduler job (#15314) 2020-12-15 03:04:03 +01:00
webpacker.yml Do not try to parse gif files as CSS or JS 2019-03-16 14:23:50 +01:00