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

# Conflicts:
#	app/models/project.rb

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

..

application_controller.rb

Fix an issue causing the Dashboard/Milestones page to be blank

2016-03-23 12:02:15 +01:00

groups_controller.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

labels_controller.rb

Fix merge conflicts - squashed commit

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

milestones_controller.rb

Use respond_to instead of a conditional to paginate milestones

2016-03-23 12:02:15 +01:00

projects_controller.rb

Fix merge conflicts - squashed commit

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

snippets_controller.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

todos_controller.rb

Fix merge conflicts - squashed commit

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