515 Commits

Author	SHA1	Message	Date
Brenda Wallace	4f465d808c	We don't need to load the resource again	2016-12-07 23:54:03 +00:00
Brenda Wallace	e695d5646a	FIX Gardens query was running twice in contoller	2016-12-07 22:27:17 +00:00
Shiny	bb0eb25dd3	Merge branch 'dev' into bw/useless-assignments	2016-12-02 14:04:30 +13:00
Brenda Wallace	03cb4a8dee	use find_or_initialize_by	2016-12-02 00:23:46 +00:00
Mackenzie Morgan	7b2be73c88	code climate	2016-12-01 00:22:52 -05:00
Mackenzie Morgan	cd0fbc80d8	Merge remote-tracking branch 'origin/photo_concern' into photo_concern	2016-12-01 00:19:42 -05:00
Mackenzie Morgan	31bbf42ad0	define valid models for photos in a constants file ... remove all hardcoded model names from photo.rb and photos_controller.rb	2016-12-01 00:19:33 -05:00
Shiny	b454132cae	Merge branch 'dev' into bw/useless-assignments	2016-12-01 12:51:13 +13:00
Mackenzie	ba4d85538c	Merge branch 'dev' into scopify	2016-11-30 16:47:22 -05:00
Brenda Wallace	178c181cf5	Merge remote-tracking branch 'upstream/dev' into bw/useless-assignments ... Conflicts: app/controllers/crops_controller.rb app/models/crop.rb spec/models/scientific_name_spec.rb	2016-11-30 10:32:02 +13:00
Brenda Wallace	9aa4fa8031	Fixes for two calls to deprecated methods	2016-11-30 10:25:23 +13:00
Mackenzie Morgan	4857fd8d2e	return from conditional	2016-11-29 12:20:17 -05:00
Mackenzie Morgan	99c8db72d6	syntax	2016-11-29 12:14:16 -05:00
Mackenzie Morgan	53849a26e5	merge	2016-11-29 12:11:52 -05:00
Mackenzie Morgan	9dc02cd3d8	make changes from code review	2016-11-29 12:10:48 -05:00
Mackenzie Morgan	c93fd78aa8	Merge branch 'dev' of gitmaco:Growstuff/growstuff into scopify	2016-11-29 09:58:02 -05:00
Mackenzie Morgan	832719b01a	merge from upstream dev	2016-11-29 09:37:25 -05:00
Mackenzie Morgan	e1e9a52186	use a guard clause	2016-11-28 22:08:14 -05:00
Mackenzie Morgan	66c8ce78bc	further DRY up crops controller	2016-11-28 22:04:32 -05:00
Mackenzie Morgan	e1a2b168c9	rename scientific_names.scientific_name to scientific_names.name ... this mirrors alternate_names.name and allows making code more DRY	2016-11-28 21:57:51 -05:00
Brenda Wallace	8c7fcd9d49	Fixed all useless assignments	2016-11-26 19:36:59 +13:00
Brenda Wallace	d60dcfbddd	Use request.referer instead of request.referrer	2016-11-26 17:26:44 +13:00
Brenda Wallace	07c135eeb5	before_filter is now before_action	2016-11-26 17:20:13 +13:00
Brenda Wallace	bcdd2a9167	Changed called to rails dynamic find_by	2016-11-26 15:55:38 +13:00
Brenda Wallace	723ebff923	Spacing fixes	2016-11-26 12:13:17 +13:00
Brenda Wallace	62e7c716dd	Removed extra empty blank lines	2016-11-26 12:06:02 +13:00
Brenda Wallace	e62adc297a	Aligning end on branches	2016-11-26 11:55:54 +13:00
Brenda Wallace	2e46cccd21	Hash alignment	2016-11-26 11:52:10 +13:00
Brenda Wallace	bbc19a5436	Array indentation fixed	2016-11-26 11:49:51 +13:00
Brenda Wallace	d268d2b09e	Fixed indentation on comments	2016-11-26 11:45:25 +13:00
Brenda Wallace	c878baa886	Indented parameters cleanup	2016-11-26 11:41:07 +13:00
Brenda Wallace	2eddaf90cf	Fixed access modifier indentation	2016-11-26 11:00:04 +13:00
Brenda Wallace	91d2998507	Fixed multi-line operation indentation	2016-11-26 10:56:23 +13:00
Brenda Wallace	7eb0ee16b9	Indentation for multiline method calls	2016-11-26 10:54:51 +13:00
Brenda Wallace	83392ddda1	Indentation clean ups	2016-11-26 10:51:54 +13:00
Brenda Wallace	be67b858b4	Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed ... Conflicts: lib/tasks/growstuff.rake	2016-11-25 08:18:18 +13:00
Brenda Wallace	fb6f1ac0a8	Changed whitelisting of what can have photos	2016-11-21 10:05:52 +13:00
Brenda Wallace	069343803e	List of types that can have photos in own method	2016-11-20 21:46:58 +13:00
Brenda Wallace	8012d9f6a8	Whitelist which items can have photos	2016-11-20 21:02:43 +13:00
Brenda Wallace	73a050df13	before_filter becomes before_action ... in photos controller	2016-11-20 20:29:45 +13:00
Brenda Wallace	138080c4d4	Tabulation fix	2016-11-20 20:18:20 +13:00
Brenda Wallace	cf70bfebe9	Further simplified photos controller	2016-11-20 20:17:27 +13:00
Brenda Wallace	f4a26d0580	has_item_id? renamed to item_id?	2016-11-20 09:06:04 +13:00
Brenda Wallace	0a54c2d986	Moved to method: collection to use for photos	2016-11-20 09:05:29 +13:00
Brenda Wallace	9c4f011fbc	Reduced percieved complexity in photos_controller.rb	2016-11-19 22:28:38 +13:00
Brenda Wallace	2872a1c29d	Wrapped all long lines. ... reduced rubocop's line length limit to 120	2016-11-17 22:02:18 +13:00
Brenda Wallace	6bd9bd98d9	Removed extra blank lines, & added a end of file	2016-11-16 12:52:48 +13:00
Brenda Wallace	510c31f669	Removed 3 blank lines that codeclimate didn't like	2016-11-14 15:10:13 +13:00
Brenda Wallace	bdb057ca0f	Removed all trailing white space	2016-11-14 15:05:32 +13:00
Mackenzie Morgan	494790bcd4	moving where clauses into scopes to keep that contained in models	2016-10-11 15:28:08 -04:00