Brenda Wallace
6bdfe5a669
Moved plantings nav bar to own file and simplified
2017-01-14 16:32:03 +13:00
Shiny
15de4ac08c
Merge branch 'dev' into bw/active-plantings
2017-01-08 11:16:19 +13:00
Shiny
5ca8829727
Merge branch 'dev' into bw/active-plantings
2017-01-05 16:35:39 +13:00
Shiny
d40eccdb63
Merge branch 'dev' into bw/harvests-linkto-plantings
2017-01-05 16:31:22 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +13:00
Brenda Wallace
b27b361e2f
Show active plantings by default
2017-01-04 16:25:19 +13:00
Shiny
8b3b28b9d6
Merge branch 'dev' into bw/garden-specs
2017-01-03 20:50:20 +13:00
Brenda Wallace
881acdccc9
Shortening long garden names on a user's page
2017-01-02 20:54:22 +13:00
Brenda Wallace
3b1753d3d5
Garden's name in link
2017-01-02 20:36:25 +13:00
Brenda Wallace
ab75f830fb
Controller garden specs for member doing what they shouldn't
2016-12-25 10:38:07 +13:00
Shiny
ee7fbb9ab9
Merge branch 'dev' into bw/guard-clauses
2016-12-21 20:53:47 +13:00
Miles Gould
4b1cdc5650
Test Model.newsletter_(un)subscribe
...
I'm not very happy with this change as-is. The tests are very shallow
(they wouldn't have caught the bug @tconquest and I found in this code,
for instance), and use the deprecated `receive_message_chain` method.
From the RSpec docs:
"Chains can be arbitrarily long, which makes it quite painless to
violate the Law of Demeter in violent ways, so you should consider any
use of receive_message_chain a code smell. Even though not all code
smells indicate real problems (think fluent interfaces),
receive_message_chain still results in brittle examples. For example, if
you write allow(foo).to receive_message_chain(:bar, :baz => 37) in a
spec and then the implementation calls foo.baz.bar, the stub will not
work."
Further work needed.
2016-12-19 22:15:53 +00:00
Brenda Wallace
ca7868b79a
Use guard clauses
2016-12-14 21:28:35 +00:00
Brenda Wallace
4f465d808c
We don't need to load the resource again
2016-12-07 23:54:03 +00:00
Brenda Wallace
e695d5646a
FIX Gardens query was running twice in contoller
2016-12-07 22:27:17 +00:00
Shiny
00e240c038
Merge branch 'dev' into bw/ParenthesesAsGroupedExpression
2016-12-07 10:06:50 +13:00
Brenda Wallace
05e7a27782
Call to verify options stays as a hash
2016-12-07 10:04:17 +13:00
Mackenzie
c760112e1b
Merge pull request #1118 from Br3nda/bw/assignment-in-condition
...
Don't use assignments in conditions
2016-12-06 12:40:00 -05:00
Brenda Wallace
a7bafafa06
Yet another wikipedia url char added to regex
2016-12-06 21:58:17 +13:00
Brenda Wallace
464c570d99
Fixed parentheses that are interp-ed as grouped expression
2016-12-06 21:23:55 +13:00
Brenda Wallace
abc5ac5f29
Don't use assignments in conditions
2016-12-06 21:18:13 +13:00
Brenda Wallace
8981a222ea
Simplified display_weight
2016-12-06 00:32:20 +00:00
Brenda Wallace
91b0c1898e
Simplifying display_harvest_description
2016-12-05 20:40:34 +00:00
Brenda Wallace
26e5a414cf
Line no longer needs wrapping
2016-12-04 21:23:33 +00: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
pozorvlak
ce9e20b2f1
Merge branch 'dev' into 658_automation
2016-12-02 13:06:56 +00: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
Jim Stallings
160c6efd04
Remove example file, add documentation
2016-12-02 15:34:38 +10:30
Jim Stallings
fe6e269c64
GS-658 - i18n automation POC
2016-12-02 15:34:38 +10:30
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
Brenda Wallace
03cb4a8dee
use find_or_initialize_by
2016-12-02 00:23:46 +00: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
