gitlab-org--gitlab-foss/config
James Lopez ad68bc63b5 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	lib/gitlab/import_export/import_export_reader.rb
2016-06-13 12:43:25 +02:00
..
environments
initializers Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller 2016-06-08 10:31:33 +02:00
locales
application.rb Attempt to fix the user page. 2016-06-01 19:42:49 -06:00
aws.yml.example
boot.rb
database.yml.env
database.yml.mysql
database.yml.postgresql
dependency_decisions.yml Add LGPLv2 to license whiltelist 2016-06-07 10:14:18 -07:00
environment.rb
gitlab.teatro.yml
gitlab.yml.example Fix incorrect registry key value 2016-06-10 15:53:56 +02:00
license_finder.yml Resolve feedback. 2016-06-06 13:39:36 -06:00
mail_room.yml Don't require Gitlab::Redis in mail_room.yml if it's already defined 2016-06-10 13:44:45 +02:00
newrelic.yml
resque.yml.example
routes.rb Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-06-13 12:43:25 +02:00
secrets.yml.example
sidekiq.yml.example
unicorn.rb.example
unicorn.rb.example.development