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

# Conflicts:
#	app/models/project.rb

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

..

badges

Fix merge conflicts - squashed commit

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

commit

Fix error on commit builds page when no builds yet

2016-04-25 17:19:57 +02:00

commits

Move cherry-pick feature specs to proper directory

2016-04-22 13:34:03 +02:00

files

Fix merge conflicts - squashed commit

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

members

Use the can? helper instead of current_user.can?

2016-04-22 15:48:58 +02:00

wiki

Simplify specs by not over-expecting

2016-05-02 18:34:14 +02:00

developer_views_empty_project_instructions_spec.rb

Fix merge conflicts - squashed commit

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

shortcuts_spec.rb

Fix merge conflicts - squashed commit

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