mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-05 14:47:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 64 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Cesy
73a2ac87da Merge pull request #1075 from Br3nda/bw/garden-link 
Bugfix: Link to garden, not member
 2016-11-27 11:00:49 +00:00
Brenda Wallace
9cce0e39f6 Limit garden names to one line 2016-11-27 14:52:07 +13:00
Brenda Wallace
10c20c7f91 Narrow-ed regex on wikipedia url 
and more tests
 2016-11-27 14:35:49 +13:00
Brenda Wallace
f52b828abe Use rake to create database 2016-11-27 13:27:45 +13:00
Brenda Wallace
c76fb15cfd Add yamllint settings 2016-11-27 13:24:21 +13:00
Brenda Wallace
167417a711 Indent travis.yml correctly 2016-11-27 13:24:02 +13:00
Brenda Wallace
7fcd3cba8d Changed phantomjs url to project official 2016-11-27 13:22:10 +13:00
Brenda Wallace
9cb58ab0c9 Wrapped the phantomjs downloading in travis.yml 2016-11-27 13:08:53 +13:00
Brenda Wallace
702bbeb724 "[Member]'s garden" link to garden, not member 2016-11-27 10:21:11 +13:00
Brenda Wallace
38fbc52a6f String interp doesn't need .to_s 2016-11-27 10:17:01 +13:00
Cesy
34e86f5881 Merge pull request #1066 from pozorvlak/autodeploy_prod 
Auto-deploy to production on successful merge
 2016-11-26 08:30:24 +00:00
Brenda Wallace
8c7fcd9d49 Fixed all useless assignments 2016-11-26 19:36:59 +13:00
Brenda Wallace
1fd7233012 Plualisation fixups 2016-11-26 17:27:13 +13:00
Brenda Wallace
d60dcfbddd Use request.referer instead of request.referrer 2016-11-26 17:26:44 +13:00
Brenda Wallace
b541fe8221 puts allowed in some files 2016-11-26 17:24:41 +13:00
Brenda Wallace
8196d94a73 Don't enforce http pos args until rails 5 2016-11-26 17:23:31 +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
20c72e1205 Upgrading poltergeist 2016-11-26 13:43:04 +13:00
Brenda Wallace
c02562518d Fixed double handling in harvest.to_s 2016-11-26 12:20:51 +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
b17e4eed7d Block indentation fixups 2016-11-26 12:02:47 +13:00
Brenda Wallace
19727144d8 Else statement alignment 2016-11-26 11:57:02 +13:00
Brenda Wallace
e62adc297a Aligning end on branches 2016-11-26 11:55:54 +13:00