mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-07 05:32:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 108 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace 82a3cc35a4 Fix member discarding to match specs 2019-08-10 15:43:06 +12:00
Brenda Wallace 1872bff346 Restore notifier 
not hooked up to mailboxer yet
 2019-08-10 12:09:23 +12:00
Brenda Wallace b3807100d1 fixes email sending 2019-08-10 11:47:45 +12:00
Brenda Wallace d4644ccdf8 Added join to members to fix error caused by discard gem 2019-08-10 11:37:52 +12:00
Brenda Wallace 5226eadfd8 fix crop join to members 2019-08-10 11:07:12 +12:00
Brenda Wallace 843e15a107 Removed notification view spec 2019-08-10 10:53:20 +12:00
Brenda Wallace 86540c3352 Removed feature plantings code and spec 
because it's not used
 2019-08-10 10:52:49 +12:00
Brenda Wallace 0a919d8599 Remove notifications spec 2019-08-10 10:50:57 +12:00
Brenda Wallace c137d5e285 update signin spec to use messages and converations 2019-08-10 10:48:48 +12:00
Brenda Wallace 9de51d8a9a Merge remote-tracking branch 'origin/mailbox' into mailbox 2019-08-10 10:39:59 +12:00
Brenda Wallace c29f0c15ee don't join to owners when fetching gardens 
discard isn't the same
 2019-08-10 10:39:40 +12:00
dependabot-preview[bot] b726d0c9bf Bump puma from 4.0.1 to 4.1.0 
Bumps [puma](https://github.com/puma/puma) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.0.1...v4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-09 21:16:24 +00:00
Brenda Wallace 2764c3f0e0 Merge branch 'dev' into mailbox 2019-08-09 22:33:22 +12:00
Brenda Wallace 1dfbecfac0 Don't re-look up planting 2019-08-09 22:32:36 +12:00
dependabot-preview[bot] b33ab3bd71 Bump js-routes from 1.4.7 to 1.4.9 
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.7 to 1.4.9.
- [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.7...v1.4.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-08 00:01:50 +00:00
Brenda Wallace b04bdd111a Merge remote-tracking branch 'upstream/dev' into mailbox 
Conflicts:
	app/views/harvests/show.html.haml
 2019-08-08 11:23:41 +12:00
Brenda Wallace e49878ff7f Delete stale.yml 2019-08-08 11:15:36 +12:00
Brenda Wallace 523eda01a0 Merge branch 'master' into dev 2019-08-08 11:15:22 +12:00
Brenda Wallace 8641c13c06 Merge pull request #2112 from Br3nda/harvest-show 
Tidy up display of harvests#show
 2019-08-08 11:14:49 +12:00
Brenda Wallace 548bc1581a Removing notification mailer spec 2019-08-08 10:21:39 +12:00
Brenda Wallace 4a81b18159 Merge remote-tracking branch 'origin/mailbox' into mailbox 2019-08-08 09:32:09 +12:00
Brenda Wallace 12c1002dc6 Removing unused notifications code 2019-08-08 09:31:53 +12:00
Brenda Wallace 0fa1966c68 Merge branch 'dev' into mailbox 2019-08-08 09:25:30 +12:00
dependabot-preview[bot] 6ebd22c8a3 Bump percy-capybara from 4.0.1 to 4.0.2 
Bumps [percy-capybara](https://github.com/percy/percy-capybara) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/percy/percy-capybara/releases)
- [Commits](https://github.com/percy/percy-capybara/compare/v4.0.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 13:47:07 +00:00
dependabot-preview[bot] 4306ab12c7 Bump haml from 5.1.1 to 5.1.2 
Bumps [haml](https://github.com/haml/haml) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v5.1.1...v5.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 13:20:56 +00:00
dependabot-preview[bot] 9a106d4ba6 Bump rubocop from 0.73.0 to 0.74.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.73.0 to 0.74.0.
- [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.73.0...v0.74.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 12:48:52 +00:00
dependabot-preview[bot] b6e5a88b32 Bump webdrivers from 4.1.1 to 4.1.2 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.1...v4.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 11:49:25 +00:00
Brenda Wallace 69d3b89e87 Update install_elasticsearch.sh 2019-08-07 22:52:11 +12:00
Brenda Wallace 4d75c59301 back to elastic 6.2.3 2019-08-07 22:51:52 +12:00
Brenda Wallace 920123f58f Merge branch 'dev' into harvest-show 2019-08-07 22:43:34 +12:00
Brenda Wallace bccd83c706 Merge branch 'dev' into mailbox 2019-08-07 22:43:15 +12:00
dependabot-preview[bot] 329bf16872 Bump rubocop-rspec from 1.34.0 to 1.35.0 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.34.0 to 1.35.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.34.0...v1.35.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 10:41:54 +00:00
Brenda Wallace 21b63d9b62 lint 2019-08-07 22:36:43 +12:00
Brenda Wallace 3a87b73620 Merge remote-tracking branch 'origin/mailbox' into mailbox 2019-08-07 22:35:02 +12:00
Brenda Wallace 909d9b34ef lint 2019-08-07 22:34:53 +12:00
Brenda Wallace 2f5f8985e7 lint 2019-08-07 22:34:41 +12:00
Brenda Wallace 2f0e387646 rubocop lint 2019-08-07 22:33:39 +12:00
Brenda Wallace 83322becb2 Use guard clause 2019-08-07 22:33:01 +12:00
codefactor-io 78852e14c9 [CodeFactor] Apply fixes 2019-08-07 10:32:24 +00:00
Brenda Wallace d208cce57b Merge branch 'dev' into mailbox 2019-08-07 22:32:00 +12:00
Brenda Wallace dc59b487ca tests for restoring conversations 2019-08-07 22:28:18 +12:00
Brenda Wallace cafbfb349f Delete and restore buttons 2019-08-07 22:18:24 +12:00
Brenda Wallace 8d12586aa2 Merge remote-tracking branch 'origin/mailbox' into mailbox 2019-08-07 21:49:40 +12:00
Brenda Wallace 60671af6ab Conversations spec 2019-08-07 21:49:27 +12:00
Brenda Wallace 33c29e54be Merge branch 'dev' into harvest-show 2019-08-07 20:00:48 +12:00
dependabot-preview[bot] 3e2d1c806b Bump faker from 1.9.6 to 2.1.0 
Bumps [faker](https://github.com/stympy/faker) from 1.9.6 to 2.1.0.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/1.9.6...v2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 07:28:54 +00:00
Daniel O'Connor 72fd579045 Merge branch 'dev' into mailbox 2019-08-07 16:41:57 +09:30
Daniel O'Connor cf03cf4ad9 Merge branch 'dev' into harvest-show 2019-08-07 16:33:40 +09:30
dependabot-preview[bot] 3345cd200c Bump capybara from 3.26.0 to 3.28.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.26.0 to 3.28.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.26.0...3.28.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 06:57:08 +00:00
Brenda Wallace 9651bc6db5 Changed notifications spec to conversations spec 2019-08-07 16:51:46 +12:00