mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-03 19:54:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 101 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
1297 Commits
Author SHA1 Message Date
Brenda Wallace a7bafafa06 Yet another wikipedia url char added to regex 2016-12-06 21:58:17 +13:00
Brenda Wallace abc5ac5f29 Don't use assignments in conditions 2016-12-06 21:18:13 +13:00
Brenda Wallace 92195d51d2 Removed redundant returns 2016-12-04 21:21:35 +00:00
Daniel O'Connor c43ec3d256 Merge branch 'dev' into bw/useless-assignments 2016-12-04 10:30:41 +10:30
Daniel O'Connor 8bb6df6ca7 Merge branch 'dev' into seed_photos 2016-12-03 16:47:13 +10:30
Daniel O'Connor afbdd1194f Merge branch 'dev' into bw/useless-assignments 2016-12-03 16:43:11 +10:30
Mackenzie 04ba871949 Merge pull request #1108 from maco/fix_photo_requires 
WIP: add require_relative to photo_capable concern for constants
 2016-12-02 23:13:56 -05:00
Shiny 7785a9d797 Merge branch 'dev' into seed_photos 2016-12-03 09:31:20 +13:00
Shiny 1388aa3b06 Merge branch 'dev' into bw/useless-assignments 2016-12-03 08:23:19 +13:00
Shiny 0c2a60ecc3 Reduce max AbcSize to 38 (#1112) 
Reduce how complex methods are allowed to be, according to our code checker, so we're forced to write readable code
 2016-12-02 08:06:53 -05:00
pozorvlak 3acaea2914 Merge branch 'dev' into fix_photo_requires 2016-12-02 12:03:53 +00:00
Shiny bb0eb25dd3 Merge branch 'dev' into bw/useless-assignments 2016-12-02 14:04:30 +13:00
Shiny 077c807958 Merge branch 'dev' into seed_photos 2016-12-02 14:04:12 +13:00
Mackenzie Morgan 2fb34bea18 narrow the regex back down 
hyphen must be the LAST thing in the character class
 2016-12-01 13:39:43 -05:00
Mackenzie Morgan 637b46ef10 add photos to seeds 
Fixes #495
 2016-12-01 12:54:55 -05:00
Mackenzie Morgan b38945d62f add require_relative to photo_capable concern for constants 
starts #1107
 2016-12-01 12:53:45 -05:00
Mackenzie Morgan 54628e6d8c expand wikipedia regex to include punctuation, because some have - or () in name 
(Fixes: #1104)
 2016-12-01 12:25:48 -05:00
Brenda Wallace d2fb96b3d7 change where.first -> find_by 2016-12-01 22:14:50 +13:00
Brenda Wallace aba06c1faf Case insensitive crop look up 2016-12-01 21:29:28 +13:00
Brenda Wallace dc504fe363 use Member.case_insensitive_login_name 2016-12-01 21:29:00 +13:00
Brenda Wallace cba02ae05c Convert where.first to find_by 2016-12-01 20:25:28 +13:00
Brenda Wallace 37adbe5f48 Moved case-insensitve login look up to method 2016-12-01 20:25:19 +13:00
Brenda Wallace ae26e3f936 Moved login_name_or_email query to own method 2016-12-01 20:25:10 +13: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
Shiny 771e6b649c Merge branch 'dev' into photo_concern 2016-12-01 12:37:23 +13:00
Brenda Wallace ce7cd5d96b Merge branch 'dev' into bw/useless-assignments 2016-12-01 11:17:56 +13:00
Mackenzie Morgan cef1bb1056 ignore has_and_belongs_to_many 2016-11-30 16:29:02 -05:00
Brenda Wallace 6321d1ac41 current order, use rails' findby 2016-12-01 10:17:22 +13:00
Mackenzie Morgan aa7ca71e5d rubocop 2016-11-30 09:47:48 -05:00
Mackenzie Morgan 77b7969fc9 DRY up photo & model interaction 
* move stuff in models into a concern
 * create combined collection for all models that have photos
 2016-11-30 00:46:58 -05:00
Brenda Wallace a2e86b3e5e Rails dynamic finds fixed 2016-11-30 12:21:27 +13: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
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 915030e583 whitespace 2016-11-29 09:40:59 -05:00
Mackenzie Morgan 832719b01a merge from upstream dev 2016-11-29 09:37:25 -05:00
Mackenzie Morgan 2129b6480d ...that was a guard clause. oops 2016-11-28 22:42:11 -05:00
Mackenzie Morgan a382caab48 clear up redundant else and unneeded returns 2016-11-28 22:08:41 -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 8763c22284 Merge remote-tracking branch 'upstream/dev' into bw/indentation-for-great-glory 
Conflicts:
	app/models/crop.rb
 2016-11-29 02:33:30 +00:00
Mackenzie Morgan b94cb2abd6 deduplicate sunniness and planted_from functions (Fixes: #1085) 2016-11-28 19:57:34 -05:00
Daniel O'Connor 7abafd7b74 Merge pull request #1084 from maco/improve_crop 
Improve crop model
 2016-11-29 10:27:13 +10:00
Mackenzie Morgan 502862128f break out if/else into discrete blocks 2016-11-28 19:20:35 -05:00
Mackenzie Morgan 96b1e78962 dedup the add from csv code (Fixes: #1082) 2016-11-28 19:12:42 -05:00
Mackenzie 0952d7d32f Merge pull request #1078 from Br3nda/bw/garden-names-one-line 
Limit garden names to one line
 2016-11-28 09:55:16 -05:00