Commit Graph

8932 Commits

Author SHA1 Message Date
Brenda Wallace
4912ef43bf Merge pull request #2690 from Growstuff/dependabot/bundler/js-routes-1.4.11
Bump js-routes from 1.4.9 to 1.4.11
2020-11-19 14:33:55 +13:00
dependabot-preview[bot]
91f9230385 Bump js-routes from 1.4.9 to 1.4.11
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.9 to 1.4.11.
- [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.9...v1.4.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-18 07:35:27 +00:00
Brenda Wallace
b7ccc32560 Merge pull request #2689 from Growstuff/dependabot/bundler/listen-3.3.1
Bump listen from 3.2.1 to 3.3.1
2020-11-18 12:09:29 +13:00
dependabot-preview[bot]
6392a1a722 Bump listen from 3.2.1 to 3.3.1
Bumps [listen](https://github.com/guard/listen) from 3.2.1 to 3.3.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.2.1...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-16 08:25:33 +00:00
Brenda Wallace
77d41ea71a Merge pull request #2688 from Growstuff/dependabot/bundler/oj-3.10.16
Bump oj from 3.10.15 to 3.10.16
2020-11-13 15:57:26 +13:00
dependabot-preview[bot]
220e8d6ecc Bump oj from 3.10.15 to 3.10.16
Bumps [oj](https://github.com/ohler55/oj) from 3.10.15 to 3.10.16.
- [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.10.15...v3.10.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-12 02:30:28 +00:00
Brenda Wallace
9835d05299 Merge pull request #2685 from Growstuff/dependabot/bundler/bootstrap-4.5.3
Bump bootstrap from 4.5.2 to 4.5.3
2020-11-12 15:28:38 +13:00
dependabot-preview[bot]
25254323cd Bump bootstrap from 4.5.2 to 4.5.3
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.5.2...v4.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-11 01:57:11 +00:00
Brenda Wallace
4553eb9cac Merge pull request #2687 from Br3nda/feature/codeclimate-config-udpate
New codeclimate config syntax
2020-11-11 14:55:10 +13:00
Brenda Wallace
d4a3da0ee4 Update rubocop config 2020-11-11 14:49:17 +13:00
Brenda Wallace
58f7ba9ff5 Adding back the TODO detector, haml, and node security 2020-11-11 14:45:29 +13:00
Brenda Wallace
b433e81303 Update rubocop 2020-11-11 14:32:01 +13:00
Brenda Wallace
885fa55461 Merge branch 'dev' into feature/codeclimate-config-udpate 2020-11-11 14:29:49 +13:00
Brenda Wallace
612e8b130a New codeclimate config syntax 2020-11-11 14:29:17 +13:00
Brenda Wallace
7173aacbe9 Merge pull request #2683 from Growstuff/dependabot/bundler/better_errors-2.9.1
Bump better_errors from 2.9.0 to 2.9.1
2020-11-09 21:34:50 +13:00
dependabot-preview[bot]
9d5a367766 Bump better_errors from 2.9.0 to 2.9.1
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.9.0...v2.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-08 21:38:52 +00:00
Brenda Wallace
e3571b3b9e Merge pull request #2684 from Growstuff/dependabot/bundler/friendly_id-5.4.1
Bump friendly_id from 5.4.0 to 5.4.1
2020-11-09 10:37:02 +13:00
dependabot-preview[bot]
866f08cec2 Bump friendly_id from 5.4.0 to 5.4.1
Bumps [friendly_id](https://github.com/norman/friendly_id) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/norman/friendly_id/releases)
- [Changelog](https://github.com/norman/friendly_id/blob/master/Changelog.md)
- [Commits](https://github.com/norman/friendly_id/compare/5.4.0...5.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-06 07:26:25 +00:00
Brenda Wallace
ac1ab61151 Merge pull request #2682 from Growstuff/dependabot/bundler/better_errors-2.9.0
Bump better_errors from 2.8.3 to 2.9.0
2020-11-06 11:11:20 +13:00
dependabot-preview[bot]
9b2082a3bc Bump better_errors from 2.8.3 to 2.9.0
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.3 to 2.9.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.3...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-05 07:33:12 +00:00
dependabot-preview[bot]
b176e76ea3 Merge pull request #2668 from Growstuff/dependabot/bundler/faraday-1.1.0 2020-11-02 23:07:13 +00:00
dependabot-preview[bot]
351c0d919d Bump faraday from 1.0.1 to 1.1.0
Bumps [faraday](https://github.com/lostisland/faraday) from 1.0.1 to 1.1.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/v1.0.1...v1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-02 21:55:43 +00:00
dependabot-preview[bot]
204eb2ee9e Merge pull request #2678 from Growstuff/dependabot/bundler/puma-5.0.4 2020-11-02 21:53:49 +00:00
dependabot-preview[bot]
f74d239a77 Bump puma from 5.0.2 to 5.0.4
Bumps [puma](https://github.com/puma/puma) from 5.0.2 to 5.0.4.
- [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/v5.0.2...v5.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-02 20:40:50 +00:00
dependabot-preview[bot]
f2b5927d11 Merge pull request #2670 from Growstuff/dependabot/bundler/omniauth-facebook-8.0.0 2020-11-02 20:38:49 +00:00
dependabot-preview[bot]
97e887673d Bump omniauth-facebook from 7.0.0 to 8.0.0
Bumps [omniauth-facebook](https://github.com/simi/omniauth-facebook) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/simi/omniauth-facebook/releases)
- [Changelog](https://github.com/simi/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/simi/omniauth-facebook/compare/v7.0.0...v8.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-02 18:05:50 +00:00
Rowan Crawford
3c8b59811b ws, is there no prettier equivalent? 2020-11-03 07:03:13 +13:00
Rowan Crawford
5afbdf7096 CONTRIBUTORS.md 2020-11-03 07:03:13 +13:00
Rowan Crawford
7d2525cad6 If you get a harvest without a planting the harvest chart wouldn't show 2020-11-03 07:03:13 +13:00
Rowan Crawford
c889b63611 the answer is not mutating @crop 2020-11-03 07:03:13 +13:00
Brenda Wallace
d36d5ff1e3 mark test as javascript 2020-11-03 07:03:13 +13:00
Rowan Crawford
86c832d6ad ws 2020-11-03 07:03:13 +13:00
Rowan Crawford
59a693ec1f test doesn't work because don't understand how to write specs 2020-11-03 07:03:13 +13:00
Rowan Crawford
63972763ec Put if statements about each chart block 2020-11-03 07:03:13 +13:00
Awesome Code
b6f8eba243 Auto corrected by following Format Css Code 2020-11-03 07:01:06 +13:00
Brenda Wallace
fae896e38e Merge remote-tracking branch 'upstream/mainline' into dev
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/overrides.scss
2020-10-29 09:37:42 +13:00
dependabot-preview[bot]
9bcf0aba0e [Security] Bump lodash from 4.17.14 to 4.17.20
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.14 to 4.17.20. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.14...4.17.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-29 09:36:02 +13:00
dependabot-preview[bot]
506c66af84 Merge pull request #2672 from Growstuff/dependabot/bundler/scout_apm-2.6.10 2020-10-27 02:15:22 +00:00
dependabot-preview[bot]
94c78e0bf4 Bump scout_apm from 2.6.9 to 2.6.10
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.9 to 2.6.10.
- [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.9...v2.6.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-26 23:41:34 +00:00
dependabot-preview[bot]
72db013fbe Merge pull request #2669 from Growstuff/dependabot/bundler/oj-3.10.15 2020-10-26 23:39:31 +00:00
dependabot-preview[bot]
8ea96d08a9 Bump oj from 3.10.14 to 3.10.15
Bumps [oj](https://github.com/ohler55/oj) from 3.10.14 to 3.10.15.
- [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.10.14...v3.10.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-26 20:57:42 +00:00
dependabot-preview[bot]
f56bb5c7cf Bump platform-api from 3.0.0 to 3.2.0
Bumps [platform-api](https://github.com/heroku/platform-api) from 3.0.0 to 3.2.0.
- [Release notes](https://github.com/heroku/platform-api/releases)
- [Changelog](https://github.com/heroku/platform-api/blob/master/CHANGELOG.md)
- [Commits](https://github.com/heroku/platform-api/compare/v3.0.0...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-27 09:54:13 +13:00
dependabot-preview[bot]
a731cadef9 Bump chartkick from 3.4.1 to 3.4.2
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v3.4.1...v3.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-27 09:53:43 +13:00
dependabot-preview[bot]
c929a11ddf Merge pull request #2666 from Growstuff/dependabot/bundler/capybara-screenshot-1.0.25 2020-10-24 04:28:08 +00:00
dependabot-preview[bot]
0f7af8e04b Bump capybara-screenshot from 1.0.24 to 1.0.25
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.24 to 1.0.25.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases)
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.24...v1.0.25)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-24 03:23:15 +00:00
dependabot-preview[bot]
202caa0b45 Bump rubocop-rspec from 1.43.2 to 1.44.1
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.43.2 to 1.44.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.43.2...v1.44.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-24 16:20:52 +13:00
dependabot-preview[bot]
ea509954c0 Bump font-awesome-sass from 5.13.0 to 5.15.1
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.13.0 to 5.15.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.13.0...5.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 13:20:16 +13:00
Awesome Code
8bd8904baa Auto corrected by following Format Css Code 2020-10-20 12:18:51 +13:00
Brenda Wallace
7d1e1dd29f Cards raised on hover 2020-10-20 12:03:06 +13:00
Brenda Wallace
61b03c5d71 Make the connecting to flickr more obvious
by making it a button with an icon
2020-10-20 12:03:06 +13:00