.gitignore

#----------------------------------------------------------------------------
# Ignore these files when commiting to a git repository.
#
# See http://help.github.com/ignore-files/ for more about ignoring files.
#
# The original version of this file is found here:
# https://github.com/RailsApps/rails-composer/blob/master/files/gitignore.txt
#
# Corrections? Improvements? Create a GitHub issue:
# http://github.com/RailsApps/rails-composer/issues
#----------------------------------------------------------------------------

# bundler state
/.bundle
/vendor/bundle/
/vendor/ruby/

# minimal Rails specific artifacts
db/*.sqlite3
/db/*.sqlite3-journal
/log/*
/tmp/*

<<<<<<< HEAD
# add /config/database.yml if it contains passwords
# /config/database.yml

=======
>>>>>>> 9f35aceee3e5cb45a3e7d537f52f16af035aff00
# various artifacts
**.war
*.rbc
*.sassc
.redcar/
.sass-cache
/config/config.yml
<<<<<<< HEAD
=======
/config/database.yml
>>>>>>> 9f35aceee3e5cb45a3e7d537f52f16af035aff00
/coverage.data
/coverage/
/db/*.javadb/
/db/*.sqlite3
/doc/api/
/doc/app/
/doc/features.html
/doc/specs.html
/public/cache
/public/stylesheets/compiled
/public/system/*
/spec/tmp/*
/cache
/capybara*
/capybara-*.html
/gems
/specifications
rerun.txt
pickle-email-*.html
.zeus.sock

# 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
#
# Here are some files you may want to ignore globally:

# scm revert files
**.orig

# Mac finder artifacts
.DS_Store

# Netbeans project directory
/nbproject/

# RubyMine project files
.idea

# Textmate project files
/*.tmproj

# vim artifacts
**.swp

# Environment files that may contain sensitive data
.env
.powenv

<<<<<<< HEAD
# tilde files are usually backup files from a text editor
*~

=======
>>>>>>> 9f35aceee3e5cb45a3e7d537f52f16af035aff00
# Ignore application configuration
/config/application.yml