Shiho Takagi b215ef03c7 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search ...

Conflicts:
	spec/models/crop_spec.rb

2015-02-18 00:47:46 +11:00

..

controllers

fix regressions

2015-02-02 00:01:49 +11:00

factories

Merge pull request #676 from pozorvlak/seed_properties

2015-02-09 14:07:20 +11:00

features

Merge pull request #701 from Skud/search_tweaks

2015-02-10 20:57:32 +11:00

helpers

implement custom Sweeper class as stop gap against errors when running specs

2014-11-16 12:01:27 +11:00

lib/haml/filters

implement custom Sweeper class as stop gap against errors when running specs

2014-11-16 12:01:27 +11:00

mailers

tests back to green

2015-02-09 22:41:35 +11:00

models

Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search

2015-02-18 00:47:46 +11:00

requests

implement custom Sweeper class as stop gap against errors when running specs

2014-11-16 12:01:27 +11:00

routing

Remove extraneous authentication routes.

2015-01-11 11:57:13 +00:00

support

fixing wrong file name

2015-01-26 22:30:19 +11:00

views

Merge branch 'dev' of https://github.com/Growstuff/growstuff into fix-request-new-crop

2015-02-10 22:12:40 +11:00

rails_helper.rb

Allow feature tests and unicorn to run at the same time

2015-01-24 12:08:02 +00:00

spec_helper.rb

edited configuration and dependencies

2014-11-18 22:24:58 +11:00