gitlab-org--gitlab-foss/app/controllers/import
Dmitriy Zaporozhets 2505300b7b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/import/google_code_controller.rb
2015-04-21 15:36:58 +03:00
..
base_controller.rb Allow projects to be imported into namespaces user is master of. 2015-04-06 14:50:43 +02:00
bitbucket_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
github_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
gitlab_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
gitorious_controller.rb Fix Gitorious import status page hiding of already added projects. 2015-02-25 15:16:24 +01:00
google_code_controller.rb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-21 15:36:58 +03:00