djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-15 12:13:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/config
History
Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.
2020-11-12 22:13:57 +01: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-11-07 18:23:02 +01:00
locales
Add follow selected followers button (#15148)
2020-11-12 16:58:00 +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
2020-11-07 18:23:02 +01:00
application.rb
Add missing locales (#15138)
2020-11-10 14:44:17 +01: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-10-21 19:10:50 +02: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-11-07 18:23:02 +01:00
secrets.yml
…
settings.yml
Merge branch 'master' into glitch-soc/merge-upstream
2020-10-21 19:10:50 +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