 Brenda Wallace
|
0e2d7b4393
|
Allow instance variables in partials for now
|
2017-04-14 01:43:42 +00:00 |
|
|
Brenda Wallace
|
f08068c289
|
Upgrade haml_lint
|
2017-04-14 01:43:42 +00:00 |
|
|
deppbot
|
ff653934ad
|
Bundle Update on 2017-04-08
|
2017-04-14 01:43:42 +00:00 |
|
|
Brenda Wallace
|
c4bed2cf4d
|
Merge branch 'haml-lint-fix' into counter-caches
|
2017-04-14 11:42:02 +12:00 |
|
|
Brenda Wallace
|
47c0f74f81
|
Ignore ConsecutiveComments and IdNames in haml for now
|
2017-04-14 11:40:52 +12:00 |
|
|
Brenda Wallace
|
171e34914b
|
Allow instance variables in partials for now
|
2017-04-14 11:40:46 +12:00 |
|
|
Brenda Wallace
|
8010a8b56c
|
Upgrade haml_lint
|
2017-04-14 11:40:40 +12:00 |
|
|
Brenda Wallace
|
ac165ce0cd
|
Adding counter caches
|
2017-04-14 11:32:31 +12:00 |
|
|
Brenda Wallace
|
4925fde28f
|
Ignore ConsecutiveComments and IdNames in haml for now
|
2017-04-14 09:43:16 +12:00 |
|
|
Brenda Wallace
|
6580cf38b0
|
Allow instance variables in partials for now
|
2017-04-13 23:02:16 +12:00 |
|
|
Brenda Wallace
|
fdf10202ba
|
Upgrade haml_lint
|
2017-04-13 22:56:07 +12:00 |
|
|
Brenda Wallace
|
85a368999b
|
we love rubocop
|
2017-04-13 14:30:51 +12:00 |
|
|
Daniel O'Connor
|
6ba4b4560e
|
Fix #1305 by adding aggregation
Expand test coverage
member_id is owner_id on plantings
Argue with ActionView::Template::Error about what we can group on
Rename variable
|
2017-04-13 14:30:41 +12:00 |
|
|
Cesy
|
71aedb136a
|
Merge pull request #1300 from Growstuff/bundle-update-2017-04-02-131809
Bundle Update on 2017-04-02
|
2017-04-08 15:06:16 +01:00 |
|
|
Shiny
|
65c988790b
|
Merge branch 'dev' into bundle-update-2017-04-02-131809
|
2017-04-06 08:04:46 +12:00 |
|
|
Brenda Wallace
|
0372d3b9b0
|
Removing pre-commit.sh script
|
2017-04-06 08:04:09 +12:00 |
|
|
Shiny
|
3272ea1ca5
|
Merge branch 'dev' into bundle-update-2017-04-02-131809
|
2017-04-06 07:51:19 +12:00 |
|
|
Shiny
|
39b461c348
|
Merge pull request #1243 from Growstuff/dev
Release 21
release21
|
2017-04-06 07:49:08 +12:00 |
|
|
pozorvlak
|
a8f7031447
|
Merge pull request #1303 from Br3nda/disable-eslint
Disable eslint
Fixes #1302, at least temporarily.
|
2017-04-05 11:15:10 +01:00 |
|
|
Shiny
|
17967b7c72
|
Merge branch 'dev' into disable-eslint
|
2017-04-04 09:07:02 +12:00 |
|
|
Brenda Wallace
|
e422c8b072
|
Disable eslint
|
2017-04-03 21:05:35 +00:00 |
|
|
Cesy
|
5392d7d900
|
Merge branch 'dev' into bundle-update-2017-04-02-131809
|
2017-04-03 08:47:32 +01:00 |
|
|
Cesy
|
d42bbe7fa3
|
Merge pull request #1299 from Br3nda/gemfile-ruby-bump
Gemfile.lock bumping ruby version to match other files
|
2017-04-03 08:46:19 +01:00 |
|
|
deppbot
|
45f2abeab5
|
Bundle Update on 2017-04-02
|
2017-04-02 13:18:11 +08:00 |
|
|
Brenda Wallace
|
7e754b8293
|
Gemfile.lock bumping ruby version to match other files
|
2017-04-01 15:19:18 +13:00 |
|
|
pozorvlak
|
1dcd84009a
|
Merge pull request #1298 from CloCkWeRX/ruby_234
Ruby 2.3.4
|
2017-03-31 14:07:36 +01:00 |
|
|
Daniel O'Connor
|
8615df264e
|
Ruby 2.3.4
|
2017-03-31 16:29:21 +10:00 |
|
|
Daniel O'Connor
|
4e400cc899
|
Merge pull request #1295 from Growstuff/bundle-update-2017-03-30-121732
Bundle Update on 2017-03-30
|
2017-03-31 16:27:43 +10:00 |
|
|
Daniel O'Connor
|
3cead5fb6b
|
Pin to earlier rubocop
|
2017-03-31 16:15:55 +10:00 |
|
|
Shiny
|
1decf6ea11
|
Merge branch 'dev' into bundle-update-2017-03-30-121732
|
2017-03-30 21:37:57 +13:00 |
|
|
Harry Brodsky
|
23c0f901c6
|
Add name to CONTRIBUTORS.md
|
2017-03-30 19:15:48 +13:00 |
|
|
Harry Brodsky
|
78f4b3dbf3
|
Update irregular crop pluralizations
|
2017-03-30 19:15:48 +13:00 |
|
|
deppbot
|
9340b8d7e5
|
Bundle Update on 2017-03-30
|
2017-03-30 12:17:33 +08:00 |
|
|
pozorvlak
|
0094473bbe
|
Merge pull request #1287 from Br3nda/bw/readme-new-contributors
Readme update for new contributors - force-merging because it only touches README.md.
|
2017-03-28 23:56:37 +01:00 |
|
|
pozorvlak
|
743f482818
|
Merge pull request #1292 from Br3nda/query-optimising
Query optimising
|
2017-03-28 23:55:05 +01:00 |
|
|
Brenda Wallace
|
b8ea6116d4
|
Add photos to plantings to make them interesting in the spec
|
2017-03-29 10:46:15 +13:00 |
|
|
Brenda Wallace
|
2521e52d71
|
Remove test called to Planting.interesting(...)
Interesting plantings with no photos is not used in the code.
The method was converted to a scope.
|
2017-03-29 08:28:58 +13:00 |
|
|
Brenda Wallace
|
d44f9ef4e9
|
Removed assignment of useless variable
|
2017-03-29 08:21:34 +13:00 |
|
|
Brenda Wallace
|
63cee1edc9
|
Back to reading @garden.plantings
|
2017-03-29 08:21:02 +13:00 |
|
|
Brenda Wallace
|
3791b34fe3
|
One planting per owner (used for intersetingness)
|
2017-03-28 22:39:03 +13:00 |
|
|
Brenda Wallace
|
5d58be110e
|
Fixed crop.interesting, no more duplicate crops
|
2017-03-28 19:33:34 +13:00 |
|
|
Brenda Wallace
|
911593b480
|
Reduces query numbes on gardens#show
|
2017-03-24 21:10:45 +13:00 |
|
|
Shiny
|
b72a3d6942
|
Merge branch 'dev' into query-optimising
|
2017-03-24 18:31:18 +13:00 |
|
|
Brenda Wallace
|
804ac8662a
|
Rubocop fix ups
|
2017-03-24 17:29:39 +13:00 |
|
|
Brenda Wallace
|
1601e966ad
|
Planting.interesting is in a scope
|
2017-03-24 16:59:09 +13:00 |
|
|
Brenda Wallace
|
e7553868f2
|
Removed variables on homes controller
following the comment there
|
2017-03-24 16:57:51 +13:00 |
|
|
Brenda Wallace
|
5e8ca392d2
|
Moved Member.interest near top of file
|
2017-03-24 16:45:55 +13:00 |
|
|
Brenda Wallace
|
815915d933
|
Loading child records of interesting crops
|
2017-03-24 16:45:36 +13:00 |
|
|
Brenda Wallace
|
6223076dae
|
Pull in interesting members data in controller
|
2017-03-24 16:30:56 +13:00 |
|
|
Brenda Wallace
|
0182a99654
|
Optimising Member.interesting
|
2017-03-24 16:28:37 +13:00 |
|