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
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
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
2e46cccd21
Hash alignment
2016-11-26 11:52:10 +13:00
Brenda Wallace
d268d2b09e
Fixed indentation on comments
2016-11-26 11:45:25 +13:00
Brenda Wallace
ebacd83dde
Case statement indentation clean up
2016-11-26 11:42:34 +13:00
Brenda Wallace
c878baa886
Indented parameters cleanup
2016-11-26 11:41:07 +13:00
Brenda Wallace
564731667e
Fixed up all remaining hash alignment
2016-11-26 11:17:42 +13:00
Brenda Wallace
83392ddda1
Indentation clean ups
2016-11-26 10:51:54 +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
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Miles Gould
ce2141ddb7
Only initialise Crop.__elasticsearch__ if needed
...
The mere presence of this field was causing any test that ran
`FactoryGirl.create :alternate_name` to try to connect to an
ElasticSearch server, even if GROWSTUFF_ELASTICSEARCH was false.
Fixes #1047
2016-10-07 14:49:09 +01:00
Miles Gould
36c88c3762
Delete trailing whitespace
2016-10-07 14:48:38 +01:00
Cesy
fe137a11bb
Merge pull request #1031 from CloCkWeRX/queue_mail
...
Queue mail in sidekiq
2016-08-24 10:38:13 +01:00
Daniel O'Connor
5d70d822eb
#951 Swap to deliver_later implementation
2016-08-16 10:55:40 +09:30
Daniel O'Connor
7f6a1a424d
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-15 23:13:55 +09:30
Daniel O'Connor
6911f7b24b
Typo
2016-07-21 12:05:37 +09:30
Daniel O'Connor
4b87977e24
It helps to type properly
2016-07-08 18:12:16 +09:30
Daniel O'Connor
dfa28264c6
#1017 When a crop has no photos, look for harvests of the crop with photos.
2016-07-08 18:09:53 +09:30
Daniel O'Connor
427b98a157
#997 If a harvest doesn't have any photos, try to look at the crop's default photo
2016-07-08 17:59:32 +09:30
Daniel O'Connor
efd112c4b8
And vs && - revised version of b50127c166
2016-07-08 17:01:59 +09:30
Mackenzie Morgan
5c7b760f34
Use array literal [] instead of Array.new
2016-07-08 16:58:34 +09:30
Mackenzie Morgan
81ae473972
space between comma-separated arguments
2016-07-08 16:58:29 +09:30
Daniel O'Connor
43e7d6f7c2
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-07-05 03:09:36 +09:30
Daniel O'Connor
7fe75ee52a
Fix DEPRECATION WARNING: #deliver is deprecated.
2016-06-10 15:45:01 +09:30
Daniel O'Connor
083035c924
Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup
2016-05-23 16:58:22 +09:30
Miles Gould
52dc111210
Merge branch 'dev' into upgradegibbon
2016-05-22 16:57:38 +01:00
Mackenzie Morgan
51a0a33b2a
upgrade gems and make API change for ruby-units
2016-05-21 16:33:42 -04:00
Daniel O'Connor
4b4e0cf69a
$ rubocop --only HashSyntax --auto-correct
...
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
Mackenzie Morgan
8659ebca2d
switch from less to sass
...
* dependency hell + bit rot on upstream libraries prevents installation on OS X
2016-05-19 15:52:54 -04:00
Cesy
260b16da11
Merge pull request #865 from CloCkWeRX/fix_progress
...
Fix progress calculations
2016-04-21 08:02:37 +01:00
Daniel O'Connor
3644a8124f
Tweak specs, implementation properly
2016-04-09 22:54:03 +09:30
Cesy
594e3470b4
Merge pull request #858 from CloCkWeRX/fix_plant_parts
...
Fix plant parts / harvests issue #853
2016-04-09 13:25:46 +01:00
Daniel O'Connor
7bb7a18b66
Fixes #850 Refactors percentage grown to model, stops rendering progress bars in situations it doesn't make sense. Adds specs.
2016-04-09 21:45:13 +09:30
Cesy
b69bb219a3
Merge pull request #859 from CloCkWeRX/add_title_validations
...
Add title validations
2016-04-03 11:45:10 +01:00
Daniel O'Connor
de8bcc38d3
#857 Add length validations to models
2016-04-03 00:13:38 +10:30
Daniel O'Connor
99a3be08eb
Fixes #853
2016-04-03 00:08:19 +10:30
