dark-firepit/mastodon
Archived
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
This repository has been archived on 2023-07-01. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/config
History
Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.
2020-01-20 15:00:22 +01:00
..
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-12 15:57:34 +01:00
locales Merge branch 'master' into glitch-soc/master 2020-01-20 15:00:22 +01:00
webpack Revert CircleCI and some webpack changes to match upstream 2019-11-20 18:05:24 +01:00
application.rb Add is to available locales (#12882) 2020-01-18 23:22: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 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 2019-11-20 15:36:09 +01:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02: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 Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
secrets.yml Upgrade to Rails 5.0.0.1 2016-08-17 17:58:00 +02:00
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