app/controllers/import · fc329696e269044a9b366dbd5135aedca93bccd4 · Forest Godfrey / gitlab-ce

Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into… · 3929972d

authored May 03, 2016

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

# Conflicts:
#	app/controllers/import/gitlab_project_controller.rb

3929972d

Name	Last commit	Last update
..
base_controller.rb		Loading commit data...
bitbucket_controller.rb		Loading commit data...
fogbugz_controller.rb		Loading commit data...
github_controller.rb		Loading commit data...
gitlab_controller.rb		Loading commit data...
gitlab_project_controller.rb		Loading commit data...
gitlab_projects_controller.rb		Loading commit data...
gitorious_controller.rb		Loading commit data...
google_code_controller.rb		Loading commit data...