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

# Conflicts:
#	app/models/project.rb

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

..

build_spec.rb

Fix Error 500 when visiting build page of project with nil runners_token

2016-01-10 18:12:47 -08:00

commit_spec.rb

Fix merge conflicts - squashed commit

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

runner_spec.rb

Fix merge conflicts - squashed commit

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

trigger_spec.rb

Fix merge conflicts - squashed commit

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

variable_spec.rb

Fix merge conflicts - squashed commit

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