app/controllers · 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
..
admin		Loading commit data...
ci		Loading commit data...
concerns		Loading commit data...
dashboard		Loading commit data...
explore		Loading commit data...
groups		Loading commit data...
import		Loading commit data...
oauth		Loading commit data...
profiles		Loading commit data...
projects		Loading commit data...
sherlock		Loading commit data...
abuse_reports_controller.rb		Loading commit data...
application_controller.rb		Loading commit data...
autocomplete_controller.rb		Loading commit data...
confirmations_controller.rb		Loading commit data...
dashboard_controller.rb		Loading commit data...
emojis_controller.rb		Loading commit data...
groups_controller.rb		Loading commit data...
help_controller.rb		Loading commit data...
invites_controller.rb		Loading commit data...
namespaces_controller.rb		Loading commit data...
omniauth_callbacks_controller.rb		Loading commit data...
passwords_controller.rb		Loading commit data...
profiles_controller.rb		Loading commit data...
projects_controller.rb		Loading commit data...
registrations_controller.rb		Loading commit data...
root_controller.rb		Loading commit data...
search_controller.rb		Loading commit data...
sent_notifications_controller.rb		Loading commit data...
sessions_controller.rb		Loading commit data...
snippets_controller.rb		Loading commit data...
uploads_controller.rb		Loading commit data...
users_controller.rb		Loading commit data...