mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-04 20:22:47 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 98 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shiny 9d68690d86 Merge pull request #1092 from Br3nda/hotfix/1079 
Check we have a planted_at ts before using
 2016-11-30 17:50:15 +13:00
Brenda Wallace 900e7361c6 Check we have a planted_at ts before doing maths with it 2016-11-30 17:39:26 +13:00
Brenda Wallace a2e86b3e5e Rails dynamic finds fixed 2016-11-30 12:21:27 +13:00
Brenda Wallace b6136d6a20 Removed ignores for rails findby 2016-11-30 10:38:00 +13:00
Mackenzie 7b0fdcf007 Merge pull request #1093 from Br3nda/bw/fix-deprecated-methods 
Fixes for two calls to deprecated methods
 2016-11-29 16:34:32 -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 72877aebaf update test for renamed scope 2016-11-29 13:41:05 -05: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 391111a5bf Merge pull request #1088 from maco/rename_scientific_name 
rename scientific_names.scientific_name to scientific_names.name
 2016-11-29 12:04:21 -05:00
Mackenzie Morgan c93fd78aa8 Merge branch 'dev' of gitmaco:Growstuff/growstuff into scopify 2016-11-29 09:58:02 -05:00
Mackenzie 818c8f0c37 Merge pull request #1090 from pozorvlak/indentation-for-great-glory 
Fix comment-style weirdness
 2016-11-29 09:53:23 -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
Miles Gould 0d8cbc5bf2 Fix comment-style weirdness 
We had an inline comment that had been split over two lines; whitespace
fixes made this look very weird.
 2016-11-29 10:44:04 +00:00
pozorvlak bac8f5e4cc Merge pull request #1072 from Br3nda/bw/indentation-for-great-glory 
the giant indentation patch of 2016, for great glory
 2016-11-29 10:42:24 +00:00
Mackenzie Morgan 69980d9ec6 tests 2016-11-28 22:50:53 -05:00
Mackenzie Morgan 2129b6480d ...that was a guard clause. oops 2016-11-28 22:42:11 -05:00
Mackenzie Morgan fe860aa1ab clean up some tests 2016-11-28 22:33:00 -05:00
Mackenzie Morgan a382caab48 clear up redundant else and unneeded returns 2016-11-28 22:08:41 -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 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 9ec2f76909 Merge pull request #1086 from maco/sunniness_planted_from 
deduplicate sunniness and planted_from functions (Fixes: #1085)
 2016-11-28 20:59:52 -05: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 e077f6c7b1 Merge pull request #1076 from Br3nda/bw/poking-travis 
Travis file lint and clean
 2016-11-28 09:57:26 -05:00
Mackenzie b25a938936 Merge pull request #1081 from CloCkWeRX/upgrade-gems-nov-2016 
Upgrade various gems for Nov 2016
 2016-11-28 09:55:54 -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
Daniel O'Connor 9963502026 bundle update i18n-tasks 2016-11-28 13:55:01 +10:00
Daniel O'Connor 5c2b14376e bundle update terminal-table 2016-11-28 10:43:46 +10:00
Daniel O'Connor 330bc912c1 bundle update bootstrap_form 2016-11-28 10:43:05 +10:00
Daniel O'Connor bd46c37f07 bundle update activemerchant 2016-11-28 10:42:03 +10:00
Daniel O'Connor c08c038df1 bundle update active_utils 2016-11-28 10:40:32 +10:00
Daniel O'Connor 0fb9ea7a11 bundle update newrelic_rpm byebug 2016-11-28 10:37:36 +10:00
Daniel O'Connor 89c29ea73c bundle update pg 2016-11-28 10:32:43 +10:00
Daniel O'Connor 9c116f5887 bundle update rspec-rails coveralls capybara-screenshot 2016-11-28 10:31:24 +10:00
Daniel O'Connor eb1013f925 bundle update jwt kramdown excon 2016-11-28 10:30:02 +10:00
Daniel O'Connor 9bd1484a95 bundle update ruby_parser rb-fsevent redis 2016-11-28 10:29:09 +10:00
Daniel O'Connor 7a90c020fc bundle update thor tins term-ansicolor 2016-11-28 10:28:07 +10:00
Daniel O'Connor 0a69ee682c Merge pull request #1073 from Br3nda/bw/poltergeist-upgrade 
Upgrading poltergeist
 2016-11-28 10:22:21 +10:00
Daniel O'Connor 8b5c63e898 Merge pull request #1077 from Br3nda/bw/wikipedia-url-regex 
Narrow-ed regex on wikipedia url
 2016-11-28 10:08:11 +10:00
Cesy dfe12fd7f8 Merge pull request #1074 from Br3nda/bw/string-interp 
String interp doesn't need .to_s in test
 2016-11-27 11:02:31 +00:00