gitlab-org--gitlab-foss/spec
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
..
controllers Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
factories Fix Style/AsciiComments cop violation 2015-06-22 14:43:51 -04:00
features Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
finders Set milestone on new issue when creating issue from index with milestone filter active. 2015-05-27 14:22:11 +02:00
fixtures Add ExternalLinkFilter to Markdown pipeline 2015-05-27 15:39:08 -04:00
helpers Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
javascripts Merge branch 'rs-dev-issue-2355' into 'master' 2015-06-22 09:48:49 +00:00
lib Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
mailers Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
models Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
requests/api Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
routing Fix Style/TrailingBlankLines cop violations 2015-06-22 14:38:33 -04:00
services Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
support Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
tasks/gitlab Fix Style/SpaceInsideHashLiteralBraces cop violations 2015-06-22 14:41:00 -04:00
workers Merge branch 'master' into rubocop-for-tests 2015-06-23 10:44:03 +02:00
factories.rb Add convenience methods to User for getting and setting 2FA status 2015-06-19 14:59:42 -04:00
factories_spec.rb Remove the invalid key factories 2015-04-11 17:12:10 -04:00
rails_helper.rb Started on the actual rspec 3 upgrade 2015-06-22 12:12:49 +02:00
spec_helper.rb Update email_spec gem 2015-06-22 12:13:46 +02:00
teaspoon_env.rb teaspoon install 2015-05-28 18:22:32 -04:00