mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-20 13:53:30 +00:00
7452a95998
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
91 lines
1.8 KiB
Plaintext
91 lines
1.8 KiB
Plaintext
# 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 log files
|
|
*.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 Javascript pending https://github.com/mastodon/mastodon/pull/23631
|
|
*.js
|
|
|
|
# Ignore Markdownlint pending https://github.com/mastodon/mastodon/pull/21972
|
|
*.md
|
|
|
|
# Ignore HTML till cleaned and included in CI
|
|
*.html
|
|
|
|
# Ignore glitch-soc emoji map file
|
|
/app/javascript/flavours/glitch/features/emoji/emoji_map.json
|
|
|
|
# Ignore glitch-soc locale files
|
|
/app/javascript/flavours/glitch/locales
|
|
/config/locales-glitch
|
|
|
|
# Ignore glitch-soc vendored CSS reset
|
|
app/javascript/flavours/glitch/styles/reset.scss
|
|
|
|
# Ignore win95 theme
|
|
app/javascript/styles/win95.scss
|