mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-11 01:27:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,967 Commits 60 Branches 82 Tags
RSpec/IncludeExamples
Commit Graph

11967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
837111f6dc Checks we have a planted_from before we pluralize it 2019-04-20 09:27:07 +12:00
Brenda Wallace
c66ee04690 Only suggest recording harvests if they planting isn't finished 2019-04-20 09:19:13 +12:00
Brenda Wallace
31c628e950 Put back our own progress bar 2019-04-20 09:18:52 +12:00
Brenda Wallace
27d12bf07e Isotope making nice layout on plantings#show 2019-04-20 09:09:07 +12:00
Brenda Wallace
89b4b3bee0 Use fas icons everywhere 2019-04-20 09:06:21 +12:00
Brenda Wallace
d4b487846d Fixed space in image name 2019-04-20 07:27:06 +12:00
Brenda Wallace
4c0c9047f9 Merge branch 'dev' into reindex-rake 2019-04-19 20:50:32 +12:00
dependabot[bot]
b221b13856 Bump searchkick from 3.1.2 to 4.0.0 
Bumps [searchkick](https://github.com/ankane/searchkick) from 3.1.2 to 4.0.0.
- [Release notes](https://github.com/ankane/searchkick/releases)
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/searchkick/compare/v3.1.2...v4.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-19 07:22:15 +00:00
Brenda Wallace
1eea251f95 Merge branch 'dev' into plantings-show 2019-04-19 10:39:26 +12:00
Brenda Wallace
1ad88c91f4 Merge pull request #1858 from Br3nda/feature/memcachier 
Remove staging file and re-instate memcachier
 2019-04-19 10:37:56 +12:00
Brenda Wallace
d7e3d2e9db Reindex in batches 2019-04-19 10:10:35 +12:00
Brenda Wallace
e81e4146e7 Merge remote-tracking branch 'origin/feature/memcachier' into feature/memcachier 2019-04-19 09:31:24 +12:00
Brenda Wallace
f60174a8b9 Merge remote-tracking branch 'upstream/dev' into feature/memcachier 2019-04-19 09:30:48 +12:00
Brenda Wallace
5908d9f9dd Merge pull request #1901 from Br3nda/feature/searchkick 
Swap elasticsearch gem for searchkick
 2019-04-19 09:26:48 +12:00
Brenda Wallace
eb46b8113f Merge remote-tracking branch 'upstream/dev' into plantings-show 2019-04-19 09:16:32 +12:00
Brenda Wallace
32a88b4482 Merge remote-tracking branch 'origin/plantings-show' into plantings-show 2019-04-19 09:16:01 +12:00
Brenda Wallace
a2e2362594 Linter fix ups 2019-04-19 09:15:41 +12:00
Brenda Wallace
6af61d0e86 Add someone else's plantings, to ensure test is valid 2019-04-19 09:11:56 +12:00
Brenda Wallace
909ce99ab8 Merge remote-tracking branch 'origin/feature/searchkick' into feature/searchkick 2019-04-19 09:06:55 +12:00
Brenda Wallace
3829db6bc2 Specs for biasing results from elastic search 2019-04-19 09:05:53 +12:00
pozorvlak
b3385663e8 Fix spelling of portobello 
Co-Authored-By: Br3nda <brenda@wallace.net.nz>
 2019-04-19 08:47:08 +12:00
Brenda Wallace
453242d04e Merge remote-tracking branch 'upstream/dev' into feature/searchkick 2019-04-19 08:43:28 +12:00
Brenda Wallace
10006599eb Merge branch 'dev' into feature/memcachier 2019-04-19 08:36:40 +12:00
pozorvlak
d7497e4342 Fixed comment 
Co-Authored-By: Br3nda <brenda@wallace.net.nz>
 2019-04-19 08:32:38 +12:00
Daniel O'Connor
1df411f162 Merge pull request #1926 from Growstuff/dependabot/bundler/selenium-webdriver-3.141.5926 
Bump selenium-webdriver from 3.141.0 to 3.141.5926
 2019-04-18 17:38:53 +09:30
Daniel O'Connor
8a14a7bc0d Merge branch 'dev' into plantings-show 2019-04-18 17:33:30 +09:30
dependabot[bot]
fcd7ad8ed6 Bump selenium-webdriver from 3.141.0 to 3.141.5926 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.141.0 to 3.141.5926.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-18 07:20:57 +00:00
Brenda Wallace
85ba701045 Merge branch 'dev' into feature/searchkick 2019-04-17 12:35:09 +12:00
Brenda Wallace
3868201c73 Merge branch 'dev' into feature/memcachier 2019-04-17 10:38:10 +12:00
Awesome Code
8b0ecd568e Auto corrected by following Lint Ruby RSpec/ImplicitSubject 2019-04-17 10:37:30 +12:00
Awesome Code
d0001691d5 Auto corrected by following Lint Ruby EmptyLine 2019-04-16 22:02:27 +12:00
Awesome Code
a4e398bb62 Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-04-16 09:55:51 +00:00
dependabot[bot]
deef508b9c Bump cancancan from 3.0.0 to 3.0.1 
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 3.0.0 to 3.0.1.
- [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/3.0.0...3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-16 20:43:16 +12:00
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