mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-06 23:27:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 64 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
9683983f23 Merge branch 'dev' into feature/searchkick 2019-04-10 20:02:35 +12:00
Brenda Wallace
7ac410c499 varieties info on crops#show (#1848) 
* Tests for crop.photos
* More info on a crop's varieties, and parent
* Update spec for new crop varieties display
* Add varieties div wrapper, so test can find the area of the page
 2019-04-10 20:02:05 +12:00
Brenda Wallace
bd1a1c53f4 Removed unneeded rubocop disable 2019-04-08 21:59:44 +12:00
Brenda Wallace
ccb69c5f7d Style/lint tidy up models 2019-04-08 21:59:26 +12:00
Brenda Wallace
e165c77d64 Force autocomplete to json format 2019-04-08 21:39:20 +12:00
Brenda Wallace
74e6a7cf2f Rename @matches to @crops 2019-04-08 21:39:20 +12:00
Brenda Wallace
5b35e3fe95 remove an unnecesary index 2019-04-08 21:39:20 +12:00
Brenda Wallace
55e89e95fe Fix a deprecation warning 2019-04-08 21:39:20 +12:00
Brenda Wallace
302e19776f code style fix up 2019-04-08 21:39:20 +12:00
Brenda Wallace
01a3654d41 Working without elastic search too 2019-04-08 21:39:20 +12:00
Brenda Wallace
77d1fc7347 Move crop searching specs from the crop model to the crop search service 2019-04-08 21:39:20 +12:00
Brenda Wallace
ca743e421d Add matching ES methods for when no elastic search configured 2019-04-08 21:39:20 +12:00
Brenda Wallace
f3ae1a8ec3 Fix dangerous sql warning 2019-04-08 21:39:20 +12:00
Brenda Wallace
789cffeca1 Eager loading 2019-04-08 21:39:20 +12:00
Brenda Wallace
e5c0edb0d0 Tidy up specs 2019-04-08 21:39:20 +12:00
Brenda Wallace
e465b6f19c Elastic search spec helper 2019-04-08 21:39:20 +12:00
Brenda Wallace
150d44ad6f named arguments for search 2019-04-08 21:39:20 +12:00
Brenda Wallace
ab57451b17 only reindex our one crop 2019-04-08 21:39:20 +12:00
Brenda Wallace
bd797a4d8e Change call to reindex crops in specs 2019-04-08 21:39:20 +12:00
Brenda Wallace
c8716b6a1a Add oj gem, to speed up json use 2019-04-08 21:39:20 +12:00
Brenda Wallace
370747390a Add default pagination to crop search service 2019-04-08 21:39:20 +12:00
Brenda Wallace
61e0c2eb1d Swap elasticssearch for searchkick 2019-04-08 21:39:20 +12:00
Brenda Wallace
ae4ad3a62a Change to use searchkick 2019-04-08 21:39:20 +12:00
Brenda Wallace
f5c7f5e6d7 Merge pull request #1883 from Growstuff/dev 
Production release
 2019-04-08 15:07:13 +12:00
Brenda Wallace
a998a8b0f6 Update README.md 2019-04-08 14:50:29 +12:00
Brenda Wallace
ad90dd6dfa Fixes wrong host name in emails 2019-04-08 14:23:34 +12:00
dependabot[bot]
a48acc0253 Bump rubocop from 0.66.0 to 0.67.2 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.66.0 to 0.67.2.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.66.0...v0.67.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-08 14:16:02 +12:00
dependabot[bot]
7ca263aa64 Bump capybara from 3.16.0 to 3.16.1 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.0 to 3.16.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.16.0...3.16.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-06 09:18:12 +13:00
dependabot[bot]
d8b70a927a Bump js-routes from 1.4.5 to 1.4.6 
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/railsware/js-routes/releases)
- [Changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/railsware/js-routes/compare/v1.4.5...v1.4.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-05 22:41:23 +13:00
dependabot[bot]
7c6a76b41c Bump cancancan from 2.3.0 to 3.0.0 
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 2.3.0 to 3.0.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases)
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.3.0...3.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-05 10:14:18 +13:00
dependabot[bot]
b43b8f5868 Bump js-routes from 1.4.4 to 1.4.5 
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/railsware/js-routes/releases)
- [Changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/railsware/js-routes/compare/v1.4.4...v1.4.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-03 03:52:09 +13:00
Brenda Wallace
c89682792c Merge branch 'dev' into feature/memcachier 2019-04-02 22:22:00 +13:00
Awesome Code
a2fd0f0ae2 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-04-01 10:15:18 +00:00
Brenda Wallace
6ef3b02764 Remove commented out code 2019-04-01 23:02:50 +13:00
Brenda Wallace
495002d8b9 Change "background" to "before" 2019-04-01 23:02:50 +13:00
Awesome Code
4ba5319ba8 Auto corrected by following Lint Ruby Capybara/FeatureMethods 2019-04-01 23:02:50 +13:00
dependabot[bot]
71ab33d20c Bump i18n-tasks from 0.9.28 to 0.9.29 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.28 to 0.9.29.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.28...v0.9.29)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 22:26:08 +13:00
Brenda Wallace
ff22adfd76 Merge branch 'dev' into feature/memcachier 2019-03-31 10:21:27 +13:00
Brenda Wallace
a62c268dda Merge branch 'dev' into plantings-show 2019-03-31 10:20:57 +13:00
Awesome Code
6e10dc2a2b Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-31 10:20:08 +13:00
Awesome Code
4dcb420534 Auto corrected by following Lint Ruby RSpec/HookArgument 2019-03-31 10:19:51 +13:00
Awesome Code
fb243c1f8d Auto corrected by following Lint Ruby RSpec/ExpectChange 2019-03-31 09:24:13 +13:00
Awesome Code
837ae8cb8e Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-03-30 18:09:37 +13:00
Awesome Code
f48e131e14 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-03-30 18:07:30 +13:00
Brenda Wallace
5e51c4ab9b Merge branch 'dev' into plantings-show 2019-03-30 18:03:31 +13:00
Brenda Wallace
a58ce0f6a2 Tidy up mobile 2019-03-30 18:01:55 +13:00
Brenda Wallace
2e91a3f381 Merge branch 'dev' into feature/memcachier 2019-03-30 16:52:50 +13:00
dependabot[bot]
30b5c0ce9d Bump capybara from 3.15.0 to 3.16.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.15.0...3.16.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-30 10:11:58 +13:00
Brenda Wallace
6cf60afec4 Don't check for markasinished on plantings#index 2019-03-29 15:49:11 +13:00
Brenda Wallace
4d95130216 Move phtos to a gallery 2019-03-29 15:48:57 +13:00