dependabot[bot]
b9a7c24da6
Bump sidekiq from 5.2.5 to 5.2.6
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.5 to 5.2.6.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.5...v5.2.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-15 20:31:42 +12:00
Awesome Code
b9ca89b336
Auto corrected by following Lint Ruby RSpec/LetBeforeExamples
2019-04-14 19:38:16 +00:00
Awesome Code
ff3ea5c52f
Auto corrected by following Lint Ruby RSpec/HookArgument
2019-04-14 18:38:06 +00:00
Awesome Code
b84b1e89c1
Auto corrected by following Lint Ruby RSpec/ExampleWording
2019-04-14 18:37:52 +00:00
Awesome Code
e54c13afe3
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-04-14 18:36:34 +00:00
Awesome Code
50a2de3709
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-04-14 10:01:46 +00:00
Brenda Wallace
0ae33d9b03
Merge branch 'dev' into plantings-show
2019-04-13 21:02:56 +12:00
Brenda Wallace
9ed955d94c
Merge branch 'dev' into feature/searchkick
2019-04-13 13:09:31 +12:00
dependabot[bot]
5a8404e356
Bump leaflet-rails from 1.3.1 to 1.4.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Changelog](https://github.com/axyjo/leaflet-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.3.1...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-13 13:08:59 +12:00
Brenda Wallace
9a17df1786
Merge branch 'dev' into feature/searchkick
2019-04-13 12:14:07 +12:00
Brenda Wallace
331a5c9a99
Merge branch 'master' into dev
2019-04-13 12:13:44 +12:00
dependabot[bot]
fb133b97b0
Bump capybara from 3.16.1 to 3.16.2 ( #1915 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.1 to 3.16.2.
- [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.1...3.16.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-13 12:12:35 +12:00
Brenda Wallace
b733a91064
Merge branch 'dev' into feature/searchkick
2019-04-13 12:10:40 +12:00
Brenda Wallace
cb680a5a0e
Auto corrected by following Lint Ruby Space ( #1917 )
2019-04-13 12:09:47 +12:00
Brenda Wallace
12d5632b63
Merge branch 'dev' into feature/searchkick
2019-04-13 12:06:37 +12:00
Brenda Wallace
3e01da0036
Remove waffle link, replace with github projects ( #1916 )
2019-04-13 12:05:58 +12:00
Brenda Wallace
e322c863b2
Removed unused arg to dbsearch
2019-04-13 10:20:33 +12:00
Brenda Wallace
e34a2d609b
Plurals spec only when we have elastic search
2019-04-13 10:17:21 +12:00
Brenda Wallace
174f54cb75
Linting
2019-04-13 10:13:36 +12:00
Brenda Wallace
0a0cd24e2a
Removed extra reindex
2019-04-13 10:06:44 +12:00
Brenda Wallace
347d751935
More plurals and misspellings in search specs
2019-04-13 10:03:18 +12:00
Brenda Wallace
026efe5d15
Rubocop lint
2019-04-13 09:50:49 +12:00
Brenda Wallace
fa1913c8b6
Split a method to reduce the complexity
2019-04-13 09:50:36 +12:00
Brenda Wallace
3ecb81300a
Re-index before we use autocomplete
...
so elastic search is in sync
2019-04-13 09:42:13 +12:00
Brenda Wallace
526450f0eb
Added search controller specs
2019-04-13 09:42:13 +12:00
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
dependabot[bot]