James Lopez 3e99123095 Fix merge conflicts - squashed commit ...

# Conflicts:
#	app/models/project.rb

2016-06-03 10:57:49 +02:00

..

admin_builds_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

admin_disables_two_factor_spec.rb

Add a button to Admin::Users#show to disable 2FA for that user

2015-07-10 17:18:33 -04:00

admin_health_check_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

admin_hooks_spec.rb

Use page.all and page.within in specs

2015-06-13 18:37:30 -04:00

admin_projects_spec.rb

Use new "clear all" button in tests

2016-04-13 12:13:53 +02:00

admin_runners_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

admin_users_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

admin_uses_repository_checks_spec.rb

Clear repository check columns asynchronously

2016-04-13 15:56:05 +02:00