mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-09 16:47:14 -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
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
Brenda Wallace
ba1c3a7159 add the notifications helper back 2019-08-07 16:20:10 +12:00
Brenda Wallace
149f92536d conversations view matching the index (avatar photos on the right) 2019-08-07 16:19:43 +12:00
Brenda Wallace
4c045374ff tidy up plantings view 2019-08-07 16:19:37 +12:00
Brenda Wallace
6af95fa722 Help percy find the correct link 2019-08-07 16:19:11 +12:00
Brenda Wallace
0c8e993006 gardens show all as a button 2019-08-07 16:18:59 +12:00
dependabot-preview[bot]
d6d5e95050 Bump searchkick from 4.0.2 to 4.1.0 
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.0.2 to 4.1.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/v4.0.2...v4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 00:24:06 +00:00
dependabot-preview[bot]
e34883d32d Bump oj from 3.8.0 to 3.8.1 
Bumps [oj](https://github.com/ohler55/oj) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.8.0...v3.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-05 22:41:29 +00:00
Brenda Wallace
5d8a952441 Merge pull request #2119 from Br3nda/fix-travis 
fixing travis build
 2019-08-06 07:23:24 +10:00
Brenda Wallace
493a49bb3e Nicer display when there are not gardens 2019-08-05 18:57:54 +12:00
Brenda Wallace
17da3bdd96 conversations view changes 2019-08-04 17:41:43 +12:00
Brenda Wallace
71c4154563 Merge remote-tracking branch 'origin/dev' into mailbox 2019-08-04 16:35:57 +12:00
Brenda Wallace
0dc1720711 Double quote to prevent globbing and word splitting. 2019-08-04 16:24:09 +12:00
Brenda Wallace
080e0dbc78 give the caller clues if they don't set a version 2019-08-04 16:21:31 +12:00
Brenda Wallace
00fbfc77e7 tidy up inbox view 2019-08-04 16:04:23 +12:00
Brenda Wallace
5157793202 wrap long line 2019-08-04 15:37:15 +12:00
Brenda Wallace
8d745ed322 Fix bundler cache 2019-08-04 13:44:52 +12:00
Brenda Wallace
9fbd4e4110 Tell travis to use trusty 2019-08-04 11:30:11 +12:00