11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	72d0514e75	Further checks in likes controller	2017-02-12 15:33:54 +13:00
Brenda Wallace	dc62365c7d	DRY likes controller further	2017-02-12 15:23:58 +13:00
Brenda Wallace	d8d94d178c	Moved some of likes#destroy out to new methods	2017-02-12 15:23:58 +13:00
Brenda Wallace	6afb12c157	Split up big methods in like controller	2017-02-12 15:23:58 +13:00
Brenda Wallace	a0be52fdaa	likes doesn't have an index	2017-02-12 15:23:58 +13:00
Brenda Wallace	6b8474e01b	Checks for cancan ability before allowing like	2017-02-12 15:23:58 +13:00
Shiny	23ae7fcd8c	Merge branch 'dev' into time-zones	2017-02-12 12:14:01 +13:00
Shiny	179cfbf6bc	Merge branch 'dev' into bw/planting_slug	2017-02-12 12:13:37 +13:00
Mackenzie	b5f82a8fc8	Merge pull request #1202 from Br3nda/code-climate-knows ... Simplified alternate names controller.	2017-02-11 11:06:30 -05:00
Brenda Wallace	54c01cbd82	Removing alternate names from rubocop todo	2017-02-11 19:48:16 +13:00
Brenda Wallace	cf9e5a6652	Adding alternate names to admin menu	2017-02-11 19:45:53 +13:00
Brenda Wallace	01c6a6da9f	improvements to alternate names controller	2017-02-11 19:45:33 +13:00
Shiny	cc1daf8f6b	Join slug with -	2017-02-10 23:54:16 +13:00
Shiny	a0bf815663	Downcase planting slug	2017-02-10 23:52:10 +13:00
Brenda Wallace	ce573c1e55	Simplified logic in planting.planting_slug	2017-02-10 22:41:28 +13:00
Brenda Wallace	be2426c99f	Use timezone when creating dates	2017-02-10 21:53:18 +13:00
Shiny	7ca314c2f2	Merge pull request #1191 from Growstuff/dev ... Release 19 release19	2017-02-10 09:24:00 +13:00
Mackenzie	36768cf384	Merge pull request #1194 from Br3nda/bw/grand-haml-cleanup-of-2017 ... More haml clean up	2017-02-08 22:46:34 -05:00
Mackenzie	e35d0455bd	Merge pull request #1196 from Br3nda/spammer-begone ... stripping html from markdown	2017-02-08 22:43:51 -05:00
Brenda Wallace	c8405830c7	Added strip_tags before processing markdown	2017-02-09 03:29:18 +00:00
Shiny	6bc9f775c2	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-09 10:23:01 +13:00
Mackenzie	a43526776b	Merge pull request #1195 from Br3nda/bw/spammer-injection-begone ... Truncate, escape, and DRY og:description fields	2017-02-07 16:00:32 -05:00
Brenda Wallace	6f74566d47	Truncate, escape, and DRY og:description fields	2017-02-08 09:49:19 +13:00
Brenda Wallace	82ce6c8222	Haml clean up for seeds views	2017-02-08 08:52:46 +13:00
Brenda Wallace	f96f459595	Moved title logic into application helper ... For harvests, plantings, and seeds	2017-02-08 07:25:59 +13:00
Brenda Wallace	096146cb84	Fix: @owner -> owner in harvests_title	2017-02-08 07:25:59 +13:00
Brenda Wallace	ba1c40702b	DRY up gardens and plantings helper	2017-02-08 07:25:59 +13:00
Brenda Wallace	e6254da3f1	Haml clean up for Roles views	2017-02-08 07:25:59 +13:00
Brenda Wallace	acbb610e05	Haml clean up for posts views	2017-02-08 07:25:59 +13:00
Brenda Wallace	338265d9e9	Haml cleanup for plantings views	2017-02-08 07:25:59 +13:00
Brenda Wallace	706922cacf	Haml clean up for plantparts views	2017-02-08 07:25:59 +13:00
Brenda Wallace	08f2877f8e	Haml clean up for places views	2017-02-08 07:25:59 +13:00
Brenda Wallace	8275f5be96	Add photos to travis haml check	2017-02-08 07:25:59 +13:00
Brenda Wallace	2c3d1848d5	Haml clean up for photos	2017-02-08 07:25:59 +13:00
Brenda Wallace	17e88778c8	Haml clean up for orders	2017-02-08 07:25:59 +13:00
Brenda Wallace	bafb0123da	Haml cleanup for notifier	2017-02-08 07:25:59 +13:00
Brenda Wallace	e1e9c32652	Moved havests#index title to a helper	2017-02-08 07:25:59 +13:00
Brenda Wallace	48c3cbb3d1	Change to hash attributes syntax in harvests#show	2017-02-08 07:25:59 +13:00
Brenda Wallace	740b8587f2	Moved complex parts of garden/nav into helper	2017-02-08 07:25:59 +13:00
Brenda Wallace	b113146aaa	Add harvest and gardens to travis for haml-lint	2017-02-08 07:25:59 +13:00
Brenda Wallace	900de8a615	Fixed Read more link in harvests	2017-02-08 07:25:59 +13:00
Brenda Wallace	d73aa98309	Cleaned up most of Home's haml	2017-02-08 07:25:59 +13:00
Brenda Wallace	ac7d44cb72	Cleaned up most of harvest's haml	2017-02-08 07:25:59 +13:00
Miles Gould	d301f2f2ae	Add static check for files with merge conflicts ... Fixes #1146	2017-02-07 15:03:52 +00:00
Miles Gould	2accb727e5	Describe rake static	2017-02-07 14:38:04 +00:00
Miles Gould	16db285898	Only run ES tests under GROWSTUFF_ELASTICSEARCH ... And vice-versa: only run non-ElasticSearch tests under GROWSTUFF_ELASTICSEARCH=false	2017-02-07 14:27:14 +00:00
Miles Gould	b8c0882642	Tag ElasticSearch-related tests	2017-02-07 14:27:14 +00:00
Miles Gould	cc54dc54b4	Only build ElasticSearch index for ES tests	2017-02-07 14:27:14 +00:00
Miles Gould	3f8ebdc477	Run JavaScript unit tests from Travis ... `rspec spec` doesn't run the Jasmine tests, annoyingly, so I've added a call to `rake jasmine:ci`.	2017-02-07 14:27:14 +00:00
Miles Gould	68120c5bbe	Make rake spec depend on rake assets:precompile	2017-02-07 14:27:14 +00:00