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
..
grack_auth_spec.rb	Fix Style/IndentationWidth cop violations	2015-06-22 22:25:40 -07:00
shell_spec.rb	Update mock and stub syntax for specs	2015-06-22 12:13:46 +02:00