mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-01 13:10:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,677 Commits 62 Branches 76 Tags
9eff48160661d4430c7bed56cf13c4490894f7f3
Commit Graph

7677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
9eff481606 Bump rubocop-rspec from 1.35.0 to 1.36.0 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.35.0 to 1.36.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.35.0...v1.36.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 12:26:09 +00:00
dependabot-preview[bot]
9ae80fbf9d Bump oj from 3.9.1 to 3.9.2 
Bumps [oj](https://github.com/ohler55/oj) from 3.9.1 to 3.9.2.
- [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.9.1...v3.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 11:06:44 +00:00
dependabot-preview[bot]
f1cc01313f Bump puma from 4.2.0 to 4.2.1 
Bumps [puma](https://github.com/puma/puma) from 4.2.0 to 4.2.1.
- [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.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 10:10:07 +00:00
dependabot-preview[bot]
09f0ec1dc0 Bump rubocop from 0.74.0 to 0.75.1 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.74.0 to 0.75.1.
- [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.74.0...v0.75.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 09:45:26 +00:00
dependabot-preview[bot]
d49a4c8db0 Bump scout_apm from 2.6.1 to 2.6.2 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.6.1...v2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 01:14:15 +00:00
dependabot-preview[bot]
6d4e68f58d Bump newrelic_rpm from 6.6.0.358 to 6.7.0.359 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 6.6.0.358 to 6.7.0.359.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/compare/6.6.0.358...6.7.0.359)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 00:53:44 +00:00
dependabot-preview[bot]
bb18d1dea3 Bump sidekiq from 6.0.0 to 6.0.2 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.0 to 6.0.2.
- [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.0...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 00:19:12 +00:00
dependabot-preview[bot]
00b8f72152 Bump faraday from 0.15.4 to 0.17.0 
Bumps [faraday](https://github.com/lostisland/faraday) from 0.15.4 to 0.17.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v0.15.4...v0.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 22:06:47 +00:00
dependabot-preview[bot]
55547d2916 Bump webdrivers from 4.1.2 to 4.1.3 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.2 to 4.1.3.
- [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.2...v4.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 21:41:22 +00:00
dependabot-preview[bot]
073cbeaab6 Bump loofah from 2.2.3 to 2.3.0 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 21:12:06 +00:00
dependabot-preview[bot]
bdbe73ada2 Bump haml_lint from 0.33.0 to 0.34.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.33.0 to 0.34.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.33.0...v0.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 20:34:39 +00:00
dependabot-preview[bot]
b9738c8c0f Bump will_paginate from 3.1.8 to 3.2.1 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.1.8 to 3.2.1.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.1.8...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 19:50:51 +00:00
dependabot-preview[bot]
a4e8cc2234 Bump bootstrap_form from 4.2.0 to 4.3.0 
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases)
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 18:21:16 +00:00
dependabot-preview[bot]
f471913b74 [Security] Bump rubyzip from 1.2.3 to 1.3.0 
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.3 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.3...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 17:58:12 +00:00
Brenda Wallace
71e6ee98b9 Merge pull request #2202 from Br3nda/role-admin 
Administer member's roles
 2019-10-21 15:52:31 +13:00
Brenda Wallace
d90a58218a Remove roles#show 2019-10-21 15:38:46 +13:00
Brenda Wallace
13c024fac9 Fixed typo in spec 2019-10-21 15:13:47 +13:00
Brenda Wallace
abd91fa37b Use bang! to indicate method can explode 2019-10-21 14:43:46 +13:00
Brenda Wallace
498a754eea update specs for admin roles 2019-10-21 14:32:23 +13:00
Brenda Wallace
6280115055 Merge branch 'role-admin' of github.com:br3nda/growstuff into role-admin 2019-10-21 14:27:02 +13:00
Brenda Wallace
47be6ad631 Merge branch 'dev' into role-admin 2019-10-21 14:24:31 +13:00
Brenda Wallace
4a1e57e42a Merge remote-tracking branch 'upstream/dev' into dev 2019-10-21 14:20:23 +13:00
Brenda Wallace
9efd9d0544 Merge remote-tracking branch 'upstream/dev' into dev 2019-10-21 14:19:57 +13:00
Brenda Wallace
8c694b3dca Only show companions of active plantings 2019-10-21 14:19:47 +13:00
Brenda Wallace
fb5b17741d Merge pull request #2222 from Br3nda/puma 
Switch from unicorn to puma
 2019-10-21 12:30:16 +13:00
Brenda Wallace
ca11792286 Only show companions of active plantings 2019-10-20 14:13:30 +13:00
Brenda Wallace
c19d09bb37 Switch from unicorn to puma 2019-10-19 18:47:28 +13:00
Brenda Wallace
7f0113a188 Merge remote-tracking branch 'upstream/master' into dev 2019-10-19 18:46:53 +13:00
Brenda Wallace
d81df50dc5 Suggest companions for a garden based on existing crops 2019-10-19 18:45:11 +13:00
Brenda Wallace
a75803d456 Merge branch 'dev' 2019-10-19 18:20:20 +13:00
Brenda Wallace
bb72d2b974 Fix bug showing plantings with no planted_at 2019-10-19 18:20:01 +13:00
Brenda Wallace
3c50705d5f Merge pull request #2220 from Growstuff/dev 
production release
 2019-10-19 16:43:10 +13:00
Brenda Wallace
c26cec4868 Merge pull request #2219 from Br3nda/feature-2207 
Group previous plantings by year
 2019-10-19 16:42:55 +13:00
Brenda Wallace
6bd7e139a6 Move views specs to admin 2019-10-19 16:04:16 +13:00
Brenda Wallace
f2dc2aeaa0 Merge branch 'dev' into feature-2207 2019-10-19 16:01:11 +13:00
Brenda Wallace
95ec89f6a0 Merge branch 'dev' into role-admin 2019-10-19 13:23:25 +13:00
Brenda Wallace
1d97250726 Merge pull request #2216 from Br3nda/wider-gardens 
Widen gardens on gardens#index
 2019-10-19 13:23:00 +13:00
Brenda Wallace
ecb0c53c80 Merge branch 'dev' into feature-2207 2019-10-19 13:22:19 +13:00
Brenda Wallace
0965168750 Group previous plantings by year 2019-10-19 11:25:19 +13:00
Brenda Wallace
dc909132ef Merge branch 'dev' into role-admin 2019-10-19 10:52:18 +13:00
Brenda Wallace
95affc8ca8 Merge branch 'dev' into wider-gardens 2019-10-19 10:50:16 +13:00
Brenda Wallace
f50417cc04 Merge pull request #2218 from Br3nda/gem-asset-fix 
Add source for leaflet
 2019-10-19 10:49:50 +13:00
Brenda Wallace
75897bad51 Update routing specs for admin roles 2019-10-19 10:28:24 +13:00
Brenda Wallace
fc07571ee1 Rename is_admin? to admin?. 2019-10-19 10:25:17 +13:00
Brenda Wallace
35c9b70bc9 Remove email from display in admin/members 2019-10-19 10:23:39 +13:00
Brenda Wallace
5a6d0f6342 Check admin before roles controller runs 2019-10-19 10:22:27 +13:00
Brenda Wallace
2ddddb1652 Updated specs for admin editing roles 2019-10-19 10:16:02 +13:00
Brenda Wallace
c940ba447e Add source for leaflet, fixes #2217 2019-10-19 09:47:29 +13:00
Brenda Wallace
dc3bc85777 Remove comments 2019-10-19 09:44:05 +13:00
Brenda Wallace
1a34bfb9a2 Merge remote-tracking branch 'origin/role-admin' into role-admin 2019-10-19 09:43:12 +13:00