Godwin
9 years ago
542 changed files with 13070 additions and 3738 deletions
@ -1,74 +1,81 @@ |
|||
# Linux.gitignore |
|||
.* |
|||
!.coveralls.yml |
|||
!.gitignore |
|||
!.rspec |
|||
!.slugignore |
|||
!.travis.yml |
|||
!.openshift |
|||
*~ |
|||
|
|||
|
|||
|
|||
# OSX.gitignore |
|||
.DS_Store |
|||
.AppleDouble |
|||
.LSOverride |
|||
Icon |
|||
|
|||
|
|||
# Thumbnails |
|||
._* |
|||
Thumbs.db |
|||
*/Thumbs.db |
|||
|
|||
# Files that might appear on external disk |
|||
.Spotlight-V100 |
|||
.Trashes |
|||
|
|||
|
|||
|
|||
# Rails.gitignore |
|||
*.rbc |
|||
*.sassc |
|||
.sass-cache |
|||
capybara-*.html |
|||
.rvmrc |
|||
/.bundle |
|||
/vendor/bundle |
|||
/log/* |
|||
/tmp/* |
|||
/db/*.sqlite3 |
|||
/public/system/* |
|||
/coverage/ |
|||
/spec/tmp/* |
|||
**.orig |
|||
rerun.txt |
|||
pickle-email-*.html |
|||
.project |
|||
|
|||
|
|||
|
|||
# Ignore Redis' dataset snapshot |
|||
dump.rdb |
|||
|
|||
# Ignore chrome driver log |
|||
chromedriver.log |
|||
|
|||
# Ignore rails_best_practices report |
|||
rails_best_practices_output.html |
|||
|
|||
# Ignore brakeman report |
|||
brakeman.html |
|||
|
|||
# Ignore file uploads |
|||
/public/uploads |
|||
|
|||
# Ignore precompiled assets |
|||
/public/assets |
|||
|
|||
# Ignore sensitive data |
|||
/config/settings/local.rb |
|||
/nbproject/private/ |
|||
<<<<<<< HEAD |
|||
/config/database.yml |
|||
# Linux.gitignore |
|||
.* |
|||
!.coveralls.yml |
|||
!.gitignore |
|||
!.rspec |
|||
!.slugignore |
|||
!.travis.yml |
|||
!.openshift |
|||
*~ |
|||
|
|||
|
|||
|
|||
# OSX.gitignore |
|||
.DS_Store |
|||
.AppleDouble |
|||
.LSOverride |
|||
Icon |
|||
|
|||
|
|||
# Thumbnails |
|||
._* |
|||
Thumbs.db |
|||
*/Thumbs.db |
|||
|
|||
# Files that might appear on external disk |
|||
.Spotlight-V100 |
|||
.Trashes |
|||
|
|||
|
|||
|
|||
# Rails.gitignore |
|||
*.rbc |
|||
*.sassc |
|||
.sass-cache |
|||
capybara-*.html |
|||
.rvmrc |
|||
/.bundle |
|||
/vendor/bundle |
|||
/log/* |
|||
/tmp/* |
|||
/db/*.sqlite3 |
|||
/public/system/* |
|||
/coverage/ |
|||
/spec/tmp/* |
|||
**.orig |
|||
rerun.txt |
|||
pickle-email-*.html |
|||
.project |
|||
|
|||
# Ignore Gemfile.lock so that we always get the most up to date gems |
|||
# We'll be testing in 'preview' to avoid clashes |
|||
Gemfile.lock |
|||
|
|||
|
|||
|
|||
# Ignore Redis' dataset snapshot |
|||
dump.rdb |
|||
|
|||
# Ignore chrome driver log |
|||
chromedriver.log |
|||
|
|||
# Ignore rails_best_practices report |
|||
rails_best_practices_output.html |
|||
|
|||
# Ignore brakeman report |
|||
brakeman.html |
|||
|
|||
# Ignore file uploads |
|||
/public/uploads |
|||
|
|||
# Ignore precompiled assets |
|||
/public/assets |
|||
/app/assets/stylesheets/application/* |
|||
/app/assets/stylesheets/email-example/* |
|||
/app/assets/stylesheets/translations/* |
|||
/app/assets/stylesheets/web-fonts/* |
|||
|
|||
# Ignore sensitive data |
|||
/config/settings/local.rb |
|||
/nbproject/private/ |
|||
/config/database.yml |
|||
|
@ -0,0 +1,4 @@ |
|||
@import "bumbleberry"; |
|||
@import "settings"; |
|||
|
|||
@include translation-pointer; |
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue