root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
gitlab-ce/spec/controllers/import
History
Dmitriy Zaporozhets f40b99d02e
Merge branch 'master' into rubocop-for-tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb
 		2015-06-23 10:44:03 +02:00
..
bitbucket_controller_spec.rb Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
github_controller_spec.rb Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
gitlab_controller_spec.rb Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
gitorious_controller_spec.rb Update and simplify Import controller specs 2015-06-22 12:13:46 +02:00
google_code_controller_spec.rb Update and simplify Import controller specs 2015-06-22 12:13:46 +02:00
import_spec_helper.rb Update and simplify Import controller specs 2015-06-22 12:13:46 +02:00