e83fc684a5
# Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.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.teatro.yml | ||
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 |