gitlab-org--gitlab-foss/spec/lib/gitlab
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
..
backend Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
bitbucket_import
diff
github_import
gitlab_import
gitorious_import
google_code_import Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
ldap
markdown
o_auth Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
satellite Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
asciidoc_spec.rb
auth_spec.rb
closing_issue_extractor_spec.rb
git_access_spec.rb
git_access_wiki_spec.rb
key_fingerprint_spec.rb
markup_helper_spec.rb
note_data_builder_spec.rb
popen_spec.rb Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
project_search_results_spec.rb
push_data_builder_spec.rb
reference_extractor_spec.rb
regex_spec.rb
themes_spec.rb
upgrader_spec.rb
url_builder_spec.rb
version_info_spec.rb