Daniel O'Connor
be572b9a53
Upgrade
2016-12-09 11:25:03 +10:30
Shiny
00e240c038
Merge branch 'dev' into bw/ParenthesesAsGroupedExpression
2016-12-07 10:06:50 +13:00
Brenda Wallace
464c570d99
Fixed parentheses that are interp-ed as grouped expression
2016-12-06 21:23:55 +13:00
Brenda Wallace
4c6f0fc929
Fixed AmbiguousOperator
2016-12-06 21:09:39 +13:00
Brenda Wallace
92195d51d2
Removed redundant returns
2016-12-04 21:21:35 +00:00
Shiny
bb0eb25dd3
Merge branch 'dev' into bw/useless-assignments
2016-12-02 14:04:30 +13:00
Shiny
b454132cae
Merge branch 'dev' into bw/useless-assignments
2016-12-01 12:51:13 +13:00
Brenda Wallace
cd0e287dba
removed member look up that wasn't used in spec
2016-12-01 12:50:16 +13:00
Shiny
771e6b649c
Merge branch 'dev' into photo_concern
2016-12-01 12:37:23 +13:00
Mackenzie
ba4d85538c
Merge branch 'dev' into scopify
2016-11-30 16:47:22 -05:00
Mackenzie
af3ca215a6
Merge branch 'dev' into photo_concern
2016-11-30 16:37:36 -05:00
Miles Gould
9400225f65
Return a string from display_days_before_maturity
...
Sometimes we were returning a string, and sometimes we were returning an
integer. We're only ever displaying the result, and this seems a little
more consistent.
2016-11-30 10:16:02 +00:00
Miles Gould
b0b864a5d4
Fix off-by-one bug in display_days_before_maturity
...
We were counting from DateTime.now rather than Date.current, causing us to
under-count by a day.
2016-11-30 10:16:02 +00:00
Miles Gould
77c64d5925
Test PlantingHelper.display_days_before_maturity
...
This ensures that #1079 is fixed.
2016-11-30 10:15:52 +00: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
72877aebaf
update test for renamed scope
2016-11-29 13:41:05 -05:00
Mackenzie Morgan
53849a26e5
merge
2016-11-29 12:11:52 -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 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
Mackenzie Morgan
69980d9ec6
tests
2016-11-28 22:50:53 -05:00
Mackenzie Morgan
fe860aa1ab
clean up some tests
2016-11-28 22:33:00 -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
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
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
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
38fbc52a6f
String interp doesn't need .to_s
2016-11-27 10:17:01 +13:00
Brenda Wallace
8c7fcd9d49
Fixed all useless assignments
2016-11-26 19:36:59 +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
b17e4eed7d
Block indentation fixups
2016-11-26 12:02:47 +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
564731667e
Fixed up all remaining hash alignment
2016-11-26 11:17:42 +13:00
Brenda Wallace
5f3dd04068
Fixed array indentation
2016-11-26 11:00:49 +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
dac2343b68
Further code duplication reduction
2016-11-20 21:18:07 +13:00
Brenda Wallace
f24e02fd11
reduced code duplication again in photos cont spec
2016-11-20 21:13:57 +13:00
Brenda Wallace
dddc7b020d
Corrected description in spec
2016-11-20 21:13:33 +13:00
Brenda Wallace
12a9a0b97d
one more check no alert was generated
2016-11-20 21:13:08 +13:00
Brenda Wallace
6a8f48693b
Reduce code duplication in photos cont spec
2016-11-20 21:12:43 +13:00
