mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-06 15:41:09 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,212 Commits 65 Branches 76 Tags
dcbc0ecdffaf77920e030a3d5bfecf62a3ba276f
Commit Graph

6212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
dcbc0ecdff Merge branch 'master' into dev 2019-03-26 22:36:54 +13:00
Brenda Wallace
c059c46833 Merge pull request #1747 from brandonbaker40/bb-track-types-of-gardens 
tracks types of gardens
 2019-03-26 22:34:48 +13:00
Brenda Wallace
8d579a4616 Gardens have descriptions 2019-03-26 22:27:10 +13:00
Brenda Wallace
1e240cf4b8 replace a rubocop ignore 2019-03-26 22:12:09 +13:00
Brenda Wallace
2d2304d8c0 Rubocop lint 2019-03-26 22:07:54 +13:00
Brenda Wallace
5d32bc8010 don't allow spaces in slug 2019-03-26 22:07:47 +13:00
Brenda Wallace
e369b93384 Pass params to garden spec - for rails 5 2019-03-26 22:07:35 +13:00
Brenda Wallace
09dc928250 Update model specs to not use should 2019-03-26 22:07:07 +13:00
Brenda Wallace
95d2aa221f Removed plot spec 2019-03-26 22:06:53 +13:00
Brenda Wallace
55f6636da5 change "required" to "optional" 2019-03-26 22:06:41 +13:00
Brenda Wallace
8a900b2e87 Update garden_Types controller spec for rails 5 2019-03-26 21:48:38 +13:00
Brenda Wallace
e5ee89c865 garden_types.description becomes garden_type.name 2019-03-26 21:43:34 +13:00
Brenda Wallace
48022fb541 nullify gardens.garden_type when garden_type is destroyed 2019-03-26 21:18:14 +13:00
Brenda Wallace
1fe5f67aa1 Update garden_type model spec 2019-03-26 21:14:31 +13:00
Brenda Wallace
63edfa36df Gardens have garden_Types in specs 2019-03-26 21:13:12 +13:00
Brenda Wallace
c71da41d43 Update controller spec 2019-03-26 21:12:20 +13:00
Brenda Wallace
cc88f5c6c7 Update subtitler 2019-03-26 21:11:25 +13:00
Brenda Wallace
629ffa1982 Update translations 2019-03-26 21:10:40 +13:00
Brenda Wallace
721a8694a0 Removing plots 2019-03-26 21:09:26 +13:00
Brenda Wallace
b51072fd00 Update test from containers to garden_types 2019-03-26 21:06:22 +13:00
Brenda Wallace
b446e44ac0 Moved garden types to admin menu 2019-03-26 21:02:48 +13:00
Brenda Wallace
5395aefa66 Rename containers to garden types 2019-03-26 20:56:11 +13:00
Brenda Wallace
02e0dd091a Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens 2019-03-26 19:35:16 +13:00
dependabot[bot]
21209ca796 Bump font-awesome-sass from 5.8.0 to 5.8.1 
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.8.0 to 5.8.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.8.0...5.8.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 12:15:31 +13:00
dependabot[bot]
0f548f773a Bump font-awesome-sass from 5.6.1 to 5.8.0 
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.6.1 to 5.8.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.6.1...5.8.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-24 22:43:13 +13:00
pozorvlak
aae1b57136 Merge pull request #1878 from Br3nda/setup/scout 
Setup scout, to analyse where our high memory usage is on production
 2019-03-22 12:38:43 +00:00
pozorvlak
9a24f29cbb Merge branch 'dev' into setup/scout 2019-03-22 12:24:29 +00:00
dependabot[bot]
03e2fc6350 Merge pull request #1874 from Growstuff/dependabot/bundler/will_paginate-3.1.7 2019-03-22 08:55:01 +00:00
dependabot[bot]
2483d30f98 Bump will_paginate from 3.1.6 to 3.1.7 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.1.6...v3.1.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 08:38:41 +00:00
dependabot[bot]
a990b17dbb Merge pull request #1881 from Growstuff/dependabot/bundler/puma-3.12.1 2019-03-22 08:36:47 +00:00
dependabot[bot]
5d019cde37 Bump puma from 3.12.0 to 3.12.1 
Bumps [puma](https://github.com/puma/puma) from 3.12.0 to 3.12.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/v3.12.0...v3.12.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 07:56:04 +00:00
Awesome Code
e10c641702 Auto corrected by following Lint Ruby Layout/AlignHash 2019-03-22 07:55:05 +00:00
dependabot[bot]
c04fba2cd6 Merge pull request #1880 from Growstuff/dependabot/bundler/capybara-3.15.0 2019-03-22 07:53:23 +00:00
Brenda Wallace
1389baec98 Merge branch 'dev' into setup/scout 2019-03-22 20:45:15 +13:00
dependabot[bot]
5607ffa638 Bump capybara from 3.14.0 to 3.15.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.14.0 to 3.15.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.14.0...3.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 07:44:56 +00:00
dependabot[bot]
d5baaa2185 Merge pull request #1873 from Growstuff/dependabot/bundler/newrelic_rpm-6.2.0.354 2019-03-22 07:09:24 +00:00
dependabot[bot]
afc769aa5f Bump rubocop from 0.65.0 to 0.66.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.65.0 to 0.66.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.65.0...v0.66.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-20 15:01:33 +13:00
dependabot[bot]
45f22c1b45 Bump responders from 2.4.0 to 2.4.1 
Bumps [responders](https://github.com/plataformatec/responders) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/plataformatec/responders/releases)
- [Changelog](https://github.com/plataformatec/responders/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/responders/compare/v2.4.0...v2.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-20 15:01:33 +13:00
Brenda Wallace
62f2fa134d Set planting.finished as a boolean 2019-03-20 15:01:33 +13:00
Brenda Wallace
6559645265 update spec 2019-03-20 15:01:33 +13:00
Brenda Wallace
d07c97b6a6 Add filters for the members api 2019-03-20 15:01:33 +13:00
dependabot[bot]
0f1c6ae3b6 Bump byebug from 11.0.0 to 11.0.1 
Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.0.0 to 11.0.1.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.0.0...v11.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-20 15:01:33 +13:00
Awesome Code
fe6f6046e4 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-03-20 15:01:33 +13:00
dependabot[bot]
4d062964b6 Bump comfortable_mexican_sofa from 2.0.17 to 2.0.18 
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa) from 2.0.17 to 2.0.18.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases)
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.17...v2.0.18)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-20 15:01:33 +13:00
dependabot[bot]
f52daa12c5 Bump dalli from 2.7.9 to 2.7.10 
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/petergoldstein/dalli/releases)
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.9...v2.7.10)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-20 15:01:33 +13:00
Awesome Code
f41ecbc68b Auto corrected by following Lint Ruby EmptyLine 2019-03-20 15:01:33 +13:00
Awesome Code
50ade63429 Auto corrected by following Lint Ruby RSpec/LeadingSubject 2019-03-20 15:01:33 +13:00
dependabot[bot]
d8be8d0c48 Bump unicorn from 5.4.1 to 5.5.0 
Bumps [unicorn](https://bogomips.org/unicorn/) from 5.4.1 to 5.5.0.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-20 15:01:33 +13:00
dependabot[bot]
89e75ffbee Bump flickraw from 0.9.9 to 0.9.10 
Bumps [flickraw](https://github.com/hanklords/flickraw) from 0.9.9 to 0.9.10.
- [Release notes](https://github.com/hanklords/flickraw/releases)
- [Commits](https://github.com/hanklords/flickraw/compare/V0.9.9...V0.9.10)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-20 15:01:33 +13:00
Awesome Code
e7713ab24b Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-20 15:01:33 +13:00