mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-23 16:44:04 -05:00
4ed09276d5
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.
92 lines
1.8 KiB
Plaintext
92 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
|
|
*.jsx
|
|
|
|
# Ignore HTML till cleaned and included in CI
|
|
*.html
|
|
|
|
# Ignore the generated AUTHORS.md
|
|
AUTHORS.md
|
|
|
|
# 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
|