config · 903da377553d37ac3263055fcc634351cc4750d4 · Forest Godfrey / gitlab-ce

Merge branches 'feature/project-export-ui-experimental' and… · e83fc684

authored Jun 13, 2016

Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

# 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

e83fc684

Name	Last commit	Last update
..
environments		Loading commit data...
initializers		Loading commit data...
locales		Loading commit data...
application.rb		Loading commit data...
aws.yml.example		Loading commit data...
boot.rb		Loading commit data...
database.yml.env		Loading commit data...
database.yml.mysql		Loading commit data...
database.yml.postgresql		Loading commit data...
dependency_decisions.yml		Loading commit data...
environment.rb		Loading commit data...
gitlab.teatro.yml		Loading commit data...
gitlab.yml.example		Loading commit data...
license_finder.yml		Loading commit data...
mail_room.yml		Loading commit data...
newrelic.yml		Loading commit data...
resque.yml.example		Loading commit data...
routes.rb		Loading commit data...
secrets.yml.example		Loading commit data...
sidekiq.yml.example		Loading commit data...
unicorn.rb.example		Loading commit data...
unicorn.rb.example.development		Loading commit data...