538e66d71c
# Conflicts: # app/models/discussion.rb # db/schema.rb |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| aws.yml.example | ||
| boot.rb | ||
| database.yml.env | ||
| database.yml.mysql | ||
| database.yml.postgresql | ||
| dependency_decisions.yml | ||
| environment.rb | ||
| gitlab.yml.example | ||
| license_finder.yml | ||
| mail_room.yml | ||
| newrelic.yml | ||
| resque.yml.example | ||
| routes.rb | ||
| secrets.yml.example | ||
| sidekiq.yml.example | ||
| unicorn.rb.example | ||
| unicorn.rb.example.development | ||