Commit Graph

  • 5b764b27e1 Merge remote-tracking branch 'upstream/master' into dev Brenda Wallace 2020-01-17 18:02:56 +13:00
  • cd344c2605 Fix error when no latitude or longitude Brenda Wallace 2020-01-17 15:15:36 +13:00
  • 904b06698e Merge pull request #2379 from Growstuff/dependabot/bundler/i18n-tasks-0.9.30 Brenda Wallace 2020-01-15 16:09:46 +13:00
  • d464124522 Bump i18n-tasks from 0.9.29 to 0.9.30 dependabot-preview[bot] 2020-01-14 07:43:44 +00:00
  • dd8311d347 Merge pull request #2377 from Growstuff/dev Brenda Wallace 2020-01-14 12:47:24 +13:00
  • 9ff43a0659 Merge pull request #2378 from Br3nda/dev Brenda Wallace 2020-01-14 12:27:22 +13:00
  • ae26965144 Merge remote-tracking branch 'upstream/master' into dev Brenda Wallace 2020-01-14 10:34:07 +13:00
  • 88fd0fb91e Merge pull request #2320 from Br3nda/cache/harvests Brenda Wallace 2020-01-13 19:59:25 +13:00
  • 6c9a15f95e [CodeFactor] Apply fixes codefactor-io 2020-01-11 21:29:37 +00:00
  • cdb60d9301 Use planting, not @planting, in plantings/harvests view Brenda Wallace 2020-01-12 10:23:26 +13:00
  • c3f75a77ac Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests Brenda Wallace 2020-01-12 10:20:29 +13:00
  • 5d8d159cc9 Update app/models/garden.rb Brenda Wallace 2020-01-12 10:20:21 +13:00
  • 9596d1bac7 style fix ups Brenda Wallace 2020-01-12 10:18:32 +13:00
  • 32c8698a44 style fix ups Brenda Wallace 2020-01-12 10:17:07 +13:00
  • 4ca949a703 Added another reindex to specs Brenda Wallace 2020-01-12 10:14:20 +13:00
  • 6cce74cf4d tests we find home page records for plantings Brenda Wallace 2020-01-12 09:52:47 +13:00
  • eb08584546 Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests Brenda Wallace 2020-01-11 23:11:00 +13:00
  • 709ca5a04f Fix seeds ES query Brenda Wallace 2020-01-11 23:10:33 +13:00
  • cdff37b2eb style fix ups Brenda Wallace 2020-01-11 22:57:09 +13:00
  • 27f22e4971 Merge branch 'dev' into cache/harvests Brenda Wallace 2020-01-11 21:23:46 +13:00
  • a5a493bbf7 Use rubocop-0-79 on codeclimate Brenda Wallace 2020-01-11 21:22:52 +13:00
  • c5b30618c0 Bump rubocop from 0.78.0 to 0.79.0 dependabot-preview[bot] 2020-01-07 09:23:56 +00:00
  • 2a61711c96 Name variable to somthing more descriptive Martina Simicic 2020-01-08 08:59:50 +01:00
  • 4893980ff0 Jump to is only shown when viewing own gardens Martina Simicic 2020-01-07 11:41:51 +01:00
  • 5e300f9dcf Unify design for gardens index page Martina Simicic 2020-01-07 11:14:47 +01:00
  • 298a20e8cc Add eager loading for garden owner Martina Simicic 2020-01-07 10:00:39 +01:00
  • 7645bd938d Bump jsonapi-swagger from 0.7.1 to 0.8.0 dependabot-preview[bot] 2020-01-06 07:54:32 +00:00
  • 0c7ca50880 small file fixes Brenda Wallace 2020-01-06 22:04:47 +13:00
  • fb71a46de7 Use positive statements Martina Simicic 2020-01-06 13:29:56 +01:00
  • 42c8e6434c Add spec for showing garden type for a garden Martina Simicic 2020-01-06 13:29:03 +01:00
  • 5895b79860 Show garden type for a garden Martina Simicic 2020-01-06 12:59:50 +01:00
  • 0f005a3c39 Make garden type optional when editing garden Martina Simicic 2020-01-03 09:21:15 +01:00
  • bdce7ec64d Bump rack-protection from 2.0.7 to 2.0.8.1 dependabot-preview[bot] 2020-01-02 07:35:27 +00:00
  • 8acd9550f4 Bump bullet from 6.0.2 to 6.1.0 dependabot-preview[bot] 2020-01-02 03:19:20 +00:00
  • 088e9a9a46 Bump faraday from 0.17.1 to 0.17.3 dependabot-preview[bot] 2020-01-02 02:56:42 +00:00
  • 103f45dd9d Bump comfortable_mexican_sofa from 2.0.18 to 2.0.19 dependabot-preview[bot] 2020-01-02 02:43:35 +00:00
  • f8287a918a Add myself to CONTRIBUTORS.md Martina Simicic 2020-01-01 21:38:00 +01:00
  • 9dae574de9 Use specific error for raise_error expectation Martina Simicic 2020-01-01 20:58:59 +01:00
  • 5297cd17cb Bump faker from 2.9.0 to 2.10.0 dependabot-preview[bot] 2019-12-30 22:10:00 +00:00
  • 4864cd8c56 Bump selenium-webdriver from 3.142.6 to 3.142.7 dependabot-preview[bot] 2019-12-30 21:56:23 +00:00
  • 307291975d Bump webdrivers from 4.1.3 to 4.2.0 dependabot-preview[bot] 2019-12-30 07:43:56 +00:00
  • 4870dd0214 Bump chartkick from 3.3.0 to 3.3.1 dependabot-preview[bot] 2019-12-27 07:28:08 +00:00
  • a595a2cd8e [CodeFactor] Apply fixes to commit 17fa995 codefactor-io 2019-12-26 03:06:15 +00:00
  • aab345cf09 Adding more counter caches Brenda 2019-12-26 16:04:28 +13:00
  • 17f5b1c562 Routes using slugs (instead of ids) Brenda 2019-12-26 15:02:30 +13:00
  • f597dd0947 Bump capybara from 3.29.0 to 3.30.0 dependabot-preview[bot] 2019-12-26 04:58:30 +00:00
  • 7257b2ada1 Update with frozen literals Brenda 2019-12-26 13:16:22 +13:00
  • c9808fdad6 Rubocop renamed cops, and fixed cops in todo file Brenda 2019-12-26 13:21:50 +13:00
  • f86a47b8a5 Update rubocop target to 5.2 Brenda 2019-12-26 13:21:24 +13:00
  • 2cf15ddfcb Bump rubocop-rails from 2.4.0 to 2.4.1 dependabot-preview[bot] 2019-12-25 07:24:38 +00:00
  • c09c9bdee4 Bump sidekiq from 6.0.3 to 6.0.4 dependabot-preview[bot] 2019-12-23 07:57:28 +00:00
  • d95cacc404 style fix ups Brenda Wallace 2020-01-10 13:39:57 +13:00
  • acbc49812d more indexing in home spec Brenda Wallace 2020-01-10 13:36:30 +13:00
  • 976b8c2058 Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests Brenda Wallace 2020-01-10 13:32:12 +13:00
  • 7a0458e7e0 reindex plantings before crop planting spec Brenda Wallace 2020-01-10 13:31:45 +13:00
  • af7de3bc87 Merge branch 'dev' into cache/harvests Brenda Wallace 2020-01-10 13:30:00 +13:00
  • 3143f0c5ee Name variable to somthing more descriptive Martina Simicic 2020-01-08 08:59:50 +01:00
  • 58c7576360 Jump to is only shown when viewing own gardens Martina Simicic 2020-01-07 11:41:51 +01:00
  • c546088e56 Unify design for gardens index page Martina Simicic 2020-01-07 11:14:47 +01:00
  • e07bb1bdb4 Add eager loading for garden owner Martina Simicic 2020-01-07 10:00:39 +01:00
  • 346e67b8f3 yet more reindexing in tests Brenda Wallace 2020-01-08 15:42:25 +13:00
  • 8dfb8ff954 Update params in seeds controller spec Brenda Wallace 2020-01-08 08:10:16 +13:00
  • 0acb054004 reindex photos before likes spec Brenda Wallace 2020-01-08 07:28:53 +13:00
  • 2ad7f5932e Merge branch 'dev' into cache/harvests Brenda Wallace 2020-01-07 22:21:37 +13:00
  • a814598bed Bump jsonapi-swagger from 0.7.1 to 0.8.0 dependabot-preview[bot] 2020-01-06 07:54:32 +00:00
  • f26aad95a2 small file fixes Brenda Wallace 2020-01-06 22:04:47 +13:00
  • 905087ab8e Use positive statements Martina Simicic 2020-01-06 13:29:56 +01:00
  • ca3b0a8c0b Add spec for showing garden type for a garden Martina Simicic 2020-01-06 13:29:03 +01:00
  • 9aaa18c0d3 Show garden type for a garden Martina Simicic 2020-01-06 12:59:50 +01:00
  • 8a6c4a774a reindexs photo in photo controller spec Brenda Wallace 2020-01-06 21:53:02 +13:00
  • bccdd6333e find the crop name from es result Brenda Wallace 2020-01-06 21:49:53 +13:00
  • 96f0866f39 rubocop fix up Brenda Wallace 2020-01-06 21:49:00 +13:00
  • feab98e962 removing dead code Brenda Wallace 2020-01-05 21:41:16 +13:00
  • c6988e2189 Re-instate the plantings quick actions Brenda Wallace 2020-01-05 21:31:51 +13:00
  • e6e020dbc9 oops Brenda Wallace 2020-01-05 20:55:51 +13:00
  • b7e53daeba fixes to crop photos Brenda Wallace 2020-01-05 16:57:14 +13:00
  • ebb8460e44 Merge branch 'dev' into cache/harvests Brenda Wallace 2020-01-05 16:56:47 +13:00
  • 88f7f09a18 Merge pull request #2360 from Growstuff/dependabot/bundler/rack-protection-2.0.8.1 Daniel O'Connor 2020-01-05 03:12:09 +10:30
  • fbb3eff090 Merge pull request #2364 from simicic/GH-2361_optional_garden_type Daniel O'Connor 2020-01-05 03:11:18 +10:30
  • 7e30b6b6e0 [CodeFactor] Apply fixes codefactor-io 2020-01-03 11:28:51 +00:00
  • ba04c44742 Make garden type optional when editing garden Martina Simicic 2020-01-03 09:21:15 +01:00
  • 2e8625d6ff Reindex harvests before harvest feature spec Brenda Wallace 2020-01-02 21:10:35 +13:00
  • 6acfa2827b Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests Brenda Wallace 2020-01-02 21:06:33 +13:00
  • d757ec4fae Reindex crops, in crop browse feature spec Brenda Wallace 2020-01-02 21:06:27 +13:00
  • 752b90ca55 Bump rack-protection from 2.0.7 to 2.0.8.1 dependabot-preview[bot] 2020-01-02 07:35:27 +00:00
  • 55411ec535 Merge branch 'dev' into cache/harvests Brenda Wallace 2020-01-02 20:33:36 +13:00
  • 8360e4ac0f Bump bullet from 6.0.2 to 6.1.0 dependabot-preview[bot] 2020-01-02 03:19:20 +00:00
  • f27ac12563 don't pass photos to crops/_photos Brenda Wallace 2020-01-02 20:29:41 +13:00
  • fb0d57c98f Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests Brenda Wallace 2020-01-02 20:23:37 +13:00
  • ff883db279 Revert "displays photos without hitting the database" Brenda Wallace 2020-01-02 20:23:13 +13:00
  • e7cf50b2ca Merge pull request #2358 from Growstuff/dependabot/bundler/faraday-0.17.3 dependabot-preview[bot] 2020-01-02 03:17:38 +00:00
  • 7c0d184d65 Bump faraday from 0.17.1 to 0.17.3 dependabot-preview[bot] 2020-01-02 02:56:42 +00:00
  • f666b6d100 Merge pull request #2357 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-2.0.19 dependabot-preview[bot] 2020-01-02 02:54:42 +00:00
  • b44b0a7a5f Bump comfortable_mexican_sofa from 2.0.18 to 2.0.19 dependabot-preview[bot] 2020-01-02 02:43:35 +00:00
  • b556c4b8f4 Merge branch 'dev' into cache/harvests Brenda Wallace 2020-01-02 15:42:17 +13:00
  • 1964b7ce2e Add myself to CONTRIBUTORS.md Martina Simicic 2020-01-01 21:38:00 +01:00
  • 9eb5fe7947 Use specific error for raise_error expectation Martina Simicic 2020-01-01 20:58:59 +01:00
  • e1b9381a03 Merge branch 'dev' into cache/harvests Brenda Wallace 2020-01-01 20:18:33 +13:00
  • 6017c04b5f don't check if post is liked by member, unless the member is signed in Brenda Wallace 2020-01-01 15:54:52 +13:00
  • 139574c9c0 displays photos without hitting the database Brenda Wallace 2020-01-01 14:14:56 +13:00