55063f854d
The old rules meant that any future changes to these directories would require the use of `git add -f` to be staged. This is problematic for the upcoming FOSS-only mirror of GitLab. Any changes to be synced to this mirror are staged using `git add --all .`, which due to the Git ignore rules would not add the tmp/ and shared/ directories. This then leads to various specs failing because they expect certain sub-directories of these directories to be available. This commit changes the rules so that we include the .gitkeep files, ignore other files, and completely ignore anything in tmp/test. This requires that the rules are specified in tmp/.gitignore and shared/.gitignore, instead of the top-level .gitignore, without this I could not get Git to include the .gitkeep files properly.
82 lines
1.4 KiB
Text
82 lines
1.4 KiB
Text
*.log
|
|
*.swp
|
|
*.mo
|
|
*.edit.po
|
|
*.rej
|
|
.DS_Store
|
|
.bundle
|
|
.chef
|
|
.directory
|
|
/.envrc
|
|
eslint-report.html
|
|
/.gitlab_shell_secret
|
|
.idea
|
|
/.vscode/*
|
|
/.rbenv-version
|
|
.rbx/
|
|
/.ruby-gemset
|
|
/.ruby-version
|
|
/.rvmrc
|
|
.sass-cache/
|
|
/.secret
|
|
/.vagrant
|
|
/.yarn-cache
|
|
/.byebug_history
|
|
/Vagrantfile
|
|
/app/assets/images/icons.json
|
|
/app/assets/images/icons.svg
|
|
/app/assets/images/illustrations/
|
|
/app/assets/javascripts/locale/**/app.js
|
|
/backups/*
|
|
/config/aws.yml
|
|
/config/database*.yml
|
|
/config/gitlab.yml
|
|
/config/gitlab_ci.yml
|
|
/config/initializers/rack_attack.rb
|
|
/config/initializers/smtp_settings.rb
|
|
/config/initializers/relative_url.rb
|
|
/config/resque.yml
|
|
/config/redis.cache.yml
|
|
/config/redis.queues.yml
|
|
/config/redis.shared_state.yml
|
|
/config/unicorn.rb
|
|
/config/puma.rb
|
|
/config/secrets.yml
|
|
/config/sidekiq.yml
|
|
/config/registry.key
|
|
/coverage/*
|
|
/coverage-javascript/
|
|
/db/*.sqlite3
|
|
/db/*.sqlite3-journal
|
|
/db/data.yml
|
|
/doc/code/*
|
|
/dump.rdb
|
|
/jsconfig.json
|
|
/log/*.log*
|
|
/node_modules/
|
|
/nohup.out
|
|
/public/assets/
|
|
/public/uploads.*
|
|
/public/uploads/
|
|
/shared/artifacts/
|
|
/rails_best_practices_output.html
|
|
/tags
|
|
/vendor/bundle/*
|
|
/vendor/gitaly-ruby
|
|
/builds*
|
|
/.gitlab_workhorse_secret
|
|
/webpack-report/
|
|
/knapsack/
|
|
/rspec_flaky/
|
|
/locale/**/LC_MESSAGES
|
|
/locale/**/*.time_stamp
|
|
/.rspec
|
|
/.gitlab_pages_secret
|
|
/.gitlab_smime_key
|
|
/.gitlab_smime_cert
|
|
package-lock.json
|
|
/junit_*.xml
|
|
/coverage-frontend/
|
|
jsdoc/
|
|
**/tmp/rubocop_cache/**
|
|
.overcommit.yml
|