James Lopez 778d72664f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export ... # Conflicts: # app/models/ci/pipeline.rb		2016-06-16 13:04:00 +02:00
..
api
gitlab_stubs
import_export
matchers	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
api_helpers.rb
capybara.rb
capybara_helpers.rb
carrierwave.rb
db_cleaner.rb
email_format_shared_examples.rb
email_helpers.rb
factory_girl.rb
fake_u2f_device.rb	Add feature specs covering U2F registration and authentication.	2016-06-06 12:50:31 +05:30
filter_spec_helper.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
fixture_helpers.rb
import_spec_helper.rb	Move ImportSpecHelper to spec/support/	2016-06-08 17:21:08 +02:00
issue_tracker_service_shared_example.rb
jira_service_helper.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
login_helpers.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
markdown_feature.rb	Hook up the updated WikiLinkFilter to the wiki controllers.	2016-06-09 10:15:01 +05:30
mentionable_shared_examples.rb
project_hook_data_shared_example.rb
reference_parser_helpers.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
relative_url.rb
repo_helpers.rb
select2_helper.rb
services_shared_context.rb
setup_builds_storage.rb
stub_configuration.rb
stub_gitlab_calls.rb	Rename all [ci_]commit to [ci_]pipeline in specs and features	2016-06-03 16:22:26 +02:00
stub_gitlab_data.rb
taskable_shared_examples.rb
test_env.rb	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
wait_for_ajax.rb
webmock.rb
workhorse_helpers.rb