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

11967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
92aa827df9 Merge pull request #2440 from Growstuff/dev 
Production release
 2020-02-23 20:01:10 +13:00
Brenda Wallace
a4a3745d90 Merge branch 'master' into dev 2020-02-23 17:12:18 +13:00
dependabot-preview[bot]
5bd97902da Bump database_cleaner from 1.8.2 to 1.8.3 
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases)
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.8.3/History.rdoc)
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.2...v1.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-23 04:05:47 +00:00
Brenda Wallace
edb3529d2d Merge pull request #2430 from Growstuff/dependabot/bundler/rubocop-0.80.0 
Bump rubocop from 0.79.0 to 0.80.0
 2020-02-23 17:04:23 +13:00
Brenda Wallace
676596191d Merge pull request #2439 from Br3nda/tidy-members 
Tidy members profile page
 2020-02-23 17:03:58 +13:00
Brenda
435c164e15 Fixed typo error in view 2020-02-23 15:47:23 +13:00
codefactor-io
28ff058366 [CodeFactor] Apply fixes 2020-02-22 23:04:59 +00:00
Brenda Wallace
7e13431c27 Merge remote-tracking branch 'upstream/dev' into tidy-members 
Conflicts:
	app/views/members/_full_summary.html.haml
 2020-02-23 12:04:20 +13:00
Brenda Wallace
71ccd52c59 Fix harvest thumbnails 2020-02-23 12:03:14 +13:00
Brenda
36bad1cda0 Fix mobile display of member profiles 2020-02-23 11:42:07 +13:00
dependabot-preview[bot]
bb13bbf27e Bump rubocop from 0.79.0 to 0.80.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.79.0 to 0.80.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.79.0...v0.80.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-22 00:15:34 +00:00
dependabot-preview[bot]
cf440b444c Bump searchkick from 4.2.1 to 4.3.0 
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.2.1 to 4.3.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.2.1...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-22 13:13:29 +13:00
Brenda Wallace
c85abe0bd1 Member planting progress (#2437) 
* Show member plantings summary on member page

* Remove reference to current member

* Tidy up member planting progress section
 2020-02-22 13:13:07 +13:00
Brenda Wallace
0177b872db Member planting progress (#2437) 
* Show member plantings summary on member page

* Remove reference to current member

* Tidy up member planting progress section
 2020-02-22 12:29:02 +13:00
Brenda Wallace
9df084a859 Merge branch 'dev' into member-planting-progress 2020-02-22 07:51:30 +13:00
Brenda Wallace
878ae9073c Tidy up member planting progress section 2020-02-22 07:49:56 +13:00
Brenda Wallace
6c9f6b7520 Merge pull request #2436 from Growstuff/dev 
Production release
 2020-02-21 16:38:04 +13:00
Brenda Wallace
c71e9b01de Remove reference to current member 2020-02-21 15:56:59 +13:00
Brenda
e3594eee02 Show member plantings summary on member page 2020-02-21 15:56:59 +13:00
Brenda Wallace
b72e866362 Remove reference to current member 2020-02-21 14:40:53 +13:00
Brenda
d3cdaea218 Show member plantings summary on member page 2020-02-20 23:01:04 +13:00
Brenda
3ab67786e0 Wrapping the whole layout, to center the page 2020-02-20 22:39:12 +13:00
Brenda Wallace
325729751a Move search bar to middle, hide sitename on small screens 2020-02-20 19:29:35 +13:00
Brenda Wallace
07a9891ec4 Fix spec 2020-02-20 19:29:35 +13:00
Brenda Wallace
e8c7a9e1f5 Fixed menu link label in another spec 2020-02-20 19:29:35 +13:00
Brenda Wallace
155f2ed548 Fix menu link label in spec 2020-02-20 19:29:35 +13:00
Brenda Wallace
76a3dcfc93 Added breadcrumbs to members 2020-02-20 19:29:35 +13:00
Brenda Wallace
63af7eca9f Fix wrapping of admin menu, and put profile link (with image) last 2020-02-20 19:29:35 +13:00
Brenda Wallace
e986eafc0b Move search bar to middle, hide sitename on small screens 2020-02-20 16:04:09 +13:00
Brenda Wallace
d4517bf298 Fix spec 2020-02-20 15:03:35 +13:00
Brenda Wallace
fe1eda3f30 Fixed menu link label in another spec 2020-02-20 15:03:35 +13:00
Brenda Wallace
0ca529ea8f Fix menu link label in spec 2020-02-20 15:03:35 +13:00
Brenda Wallace
aa2893f666 Added breadcrumbs to members 2020-02-20 15:03:35 +13:00
Brenda Wallace
2006210d4e Fix wrapping of admin menu, and put profile link (with image) last 2020-02-20 15:03:35 +13:00
Brenda Wallace
b208850b7d Full width on mobile 2020-02-19 20:25:06 +13:00
Brenda Wallace
724ba246a3 More crops 2020-02-19 17:00:06 +13:00
Brenda Wallace
00a984a3a5 Removed cute icon that was making sections not line up 2020-02-19 16:59:13 +13:00
Brenda Wallace
bc59827009 Col for recent crops 2020-02-19 16:45:45 +13:00
Brenda Wallace
2208a35b2f More space on home 2020-02-19 16:43:33 +13:00
Brenda Wallace
3764544965 Ten crops on home page 2020-02-19 16:27:03 +13:00
Brenda Wallace
495b52c2ef Merge remote-tracking branch 'upstream/dev' 2020-02-19 16:26:29 +13:00
Brenda Wallace
a60a1ded32 Nine seeds on home page 2020-02-19 16:25:36 +13:00
dependabot-preview[bot]
b56cc37991 Merge pull request #2427 from Growstuff/dependabot/bundler/rubocop-rspec-1.38.1 2020-02-18 10:17:05 +00:00
dependabot-preview[bot]
899419a89f Bump rubocop-rspec from 1.38.0 to 1.38.1 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.38.0 to 1.38.1.
- [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.38.0...v1.38.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 09:50:25 +00:00
dependabot-preview[bot]
ae581d5361 Merge pull request #2428 from Growstuff/dependabot/bundler/faker-2.10.2 2020-02-18 09:48:00 +00:00
dependabot-preview[bot]
44e684611b Bump faker from 2.10.1 to 2.10.2 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.10.2.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/commits/v2.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 09:24:21 +00:00
dependabot-preview[bot]
b6ec583b0f Bump discard from 1.1.0 to 1.2.0 
Bumps [discard](https://github.com/jhawthorn/discard) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases)
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhawthorn/discard/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 22:21:58 +13:00
dependabot-preview[bot]
94e06e4148 Bump sidekiq from 6.0.4 to 6.0.5 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.4 to 6.0.5.
- [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/v6.0.4...v6.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 07:13:16 +13:00
Brenda Wallace
cf60a75480 Merge pull request #2426 from Growstuff/dev 
Production release
 2020-02-15 10:46:35 +13:00
Brenda
88615a55f4 CSS for seeds cards 2020-02-15 10:05:14 +13:00