Shiny
ab332976da
Merge branch 'dev' into bw/rubocop
2017-01-15 17:36:17 +13:00
Brenda Wallace
39888d44e2
Rubocop compliance for the account model
2017-01-14 21:11:02 +13:00
Brenda Wallace
b603bae1a7
Rubocop compliance for the notification model
2017-01-14 21:09:47 +13:00
Brenda Wallace
05db5f3109
Rubocop compliance for the order_item model
2017-01-14 21:08:47 +13:00
Brenda Wallace
ad72ab0ba8
Rubocop compliance for the role model
2017-01-14 21:04:19 +13:00
Brenda Wallace
3beb3974fc
Rubocop compliance for the product model
2017-01-14 21:03:01 +13:00
Brenda Wallace
fa15fd2912
Rubocop compliance for the photo model
2017-01-14 21:01:46 +13:00
Brenda Wallace
78ed7869c5
Rubocop compliance for the member model
2017-01-14 20:57:18 +13:00
Brenda Wallace
0fa9f54c9c
Rename member.has_role? to role?
2017-01-14 20:54:43 +13:00
Brenda Wallace
f214f608ff
Rename member.is_paid? to paid?
2017-01-14 20:51:22 +13:00
Brenda Wallace
eb70f6dc57
Rubocop compliance for the seed model
2017-01-14 20:48:19 +13:00
Brenda Wallace
43c4b154f9
Rubocop compliance for the follow model
2017-01-14 20:45:54 +13:00
Brenda Wallace
832a20eac9
Rubocop compliance for order model
2017-01-14 20:42:32 +13:00
Brenda Wallace
f6cc0f3e13
rubocop compliance in post model
2017-01-14 20:34:08 +13:00
Brenda Wallace
5be5585084
Rubocop disable Rails/HasAndBelongsToMany
2017-01-14 20:31:34 +13:00
Brenda Wallace
989f176fb7
Crop model adhering to rubocop
2017-01-14 20:09:54 +13:00
Brenda Wallace
be07b5fd0e
Only check values.zero? if they are present
2017-01-14 20:09:09 +13:00
Brenda Wallace
d07509f9e4
Rubocop compliance for comment model
2017-01-14 17:23:39 +13:00
Brenda Wallace
0c1220d11f
Rubocop compliance for harvest model
2017-01-14 17:22:33 +13:00
Brenda Wallace
f889b112fe
Rubocop compliance for garden model
2017-01-14 17:20:21 +13:00
Brenda Wallace
eba397117c
Planting needs to calculate slugs before model is valid
2017-01-14 11:41:48 +13:00
Brenda Wallace
405dfe4bc9
Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links
2017-01-08 21:35:59 +13:00
Brenda Wallace
062ff16acf
Put garden.to_s back to garden.name
2017-01-07 13:17:53 +13:00
Brenda Wallace
90b19d52bb
Don't rely on to_s for slug. Fragile with translations
2017-01-07 12:49:57 +13:00
Brenda Wallace
76be980163
Translate garden.location
2017-01-07 12:48:14 +13:00
Brenda Wallace
88b1f02574
Added require of photo model constants
2017-01-07 12:44:08 +13:00
Brenda Wallace
5319d23ee3
Using translations on links from photo page
2017-01-07 12:03:31 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +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
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
abc5ac5f29
Don't use assignments in conditions
2016-12-06 21:18:13 +13: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
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
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
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
