ce84d163cc
Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes.
82 lines
1.6 KiB
Text
82 lines
1.6 KiB
Text
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
|
|
#
|
|
# If you find yourself ignoring temporary files generated by your text editor
|
|
# or operating system, you probably want to add a global ignore instead:
|
|
# git config --global core.excludesfile '~/.gitignore_global'
|
|
|
|
# Ignore bundler config and downloaded libraries.
|
|
/.bundle
|
|
/vendor/bundle
|
|
|
|
# Ignore the default SQLite database.
|
|
/db/*.sqlite3
|
|
/db/*.sqlite3-journal
|
|
|
|
# Ignore all logfiles and tempfiles.
|
|
.eslintcache
|
|
/log/*
|
|
!/log/.keep
|
|
/tmp
|
|
/coverage
|
|
/public/system
|
|
/public/assets
|
|
/public/packs
|
|
/public/packs-test
|
|
.env
|
|
.env.production
|
|
.env.development
|
|
/node_modules/
|
|
/build/
|
|
|
|
# Ignore Vagrant files
|
|
.vagrant/
|
|
|
|
# Ignore Capistrano customizations
|
|
/config/deploy/*
|
|
|
|
# Ignore IDE files
|
|
.vscode/
|
|
.idea/
|
|
|
|
# Ignore postgres + redis + elasticsearch volume optionally created by docker-compose
|
|
/postgres
|
|
/postgres14
|
|
/redis
|
|
/elasticsearch
|
|
|
|
# Ignore Apple files
|
|
.DS_Store
|
|
|
|
# Ignore vim files
|
|
*~
|
|
*.swp
|
|
|
|
# Ignore npm debug log
|
|
npm-debug.log
|
|
|
|
# Ignore yarn log files
|
|
yarn-error.log
|
|
yarn-debug.log
|
|
|
|
# Ignore vagrant log files
|
|
*-cloudimg-console.log
|
|
|
|
# Ignore Docker option files
|
|
docker-compose.override.yml
|
|
|
|
# Ignore emoji map file
|
|
/app/javascript/mastodon/features/emoji/emoji_map.json
|
|
|
|
# Ignore locale files
|
|
/app/javascript/mastodon/locales
|
|
/config/locales
|
|
|
|
# Ignore vendored CSS reset
|
|
app/javascript/styles/mastodon/reset.scss
|
|
|
|
# Ignore glitch-soc locale files
|
|
/app/javascript/flavours/glitch/locales
|
|
/config/locales-glitch
|
|
|
|
# Ignore glitch-soc emoji map file
|
|
/app/javascript/flavours/glitch/features/emoji/emoji_map.json
|