gitlab-org--gitlab-foss/spec/lib
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
..
gitlab Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
disable_email_interceptor_spec.rb Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
extracts_path_spec.rb Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
file_size_validator_spec.rb Fix Style/IndentationWidth cop violations 2015-06-22 22:25:40 -07:00
git_ref_validator_spec.rb Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00
repository_cache_spec.rb Remove unnecessary require from RepositoryCache spec 2015-06-04 11:40:43 -04:00
votes_spec.rb Fix Style/AlignHash cop violations 2015-06-22 22:24:39 -07:00