Commit Graph

11959 Commits

Author SHA1 Message Date
Brenda Wallace
2989e59a7c Add bonsai to heroku config 2019-06-13 04:20:59 +00:00
Daniel O'Connor
d4c3927e61 Merge branch 'dev' into dependabot/bundler/jsonapi-resources-0.9.8 2019-06-13 13:44:33 +09:30
dependabot-preview[bot]
8486921924 [Security] Bump chartkick from 3.1.0 to 3.2.0
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.1.0 to 3.2.0. **This update includes security fixes.**
- [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.1.0...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-12 05:15:09 +00:00
dependabot-preview[bot]
cb7c965b69 Bump capybara-screenshot from 1.0.22 to 1.0.23
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.22 to 1.0.23.
- [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.22...v1.0.23)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-12 05:00:21 +00:00
codefactor-io
a9f8df62c5 [CodeFactor] Apply fixes 2019-06-12 04:52:57 +00:00
Brenda Wallace
9285ffaec7 Update app/views/members/_actions.html.haml 2019-06-12 16:51:55 +12:00
Brenda Wallace
329e856569 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-12 16:27:49 +12:00
Brenda Wallace
39586cc1ba Update app/controllers/plantings_controller.rb 2019-06-12 16:23:29 +12:00
Brenda Wallace
cfac7defed Remove commented out gem 2019-06-12 16:20:11 +12:00
Daniel O'Connor
6244c4bfe9 Merge branch 'dev' into upgrade/bootstrap 2019-06-12 13:43:15 +09:30
Daniel O'Connor
2fa7f52503 Merge branch 'dev' into dependabot/bundler/jsonapi-resources-0.9.8 2019-06-12 13:41:29 +09:30
dependabot-preview[bot]
ff250711e4 Bump capybara from 3.22.0 to 3.23.0
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.22.0 to 3.23.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.22.0...3.23.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-12 04:10:45 +00:00
Brenda Wallace
878c692b27 posts display 2019-06-12 14:48:00 +12:00
Brenda Wallace
44e861dc6f block buttons 2019-06-12 14:47:43 +12:00
Brenda Wallace
1473842e05 Merge branch 'upgrade/bootstrap' of github.com:br3nda/growstuff into upgrade/bootstrap 2019-06-12 14:40:14 +12:00
Brenda Wallace
6d8c02f282 Make the member icon tiny on comments 2019-06-12 14:39:37 +12:00
Brenda Wallace
a495807739 Percy snapshots for notifications 2019-06-12 14:29:49 +12:00
Brenda Wallace
9982e94af7 Run all feature specs to find percy snapshots 2019-06-12 14:29:28 +12:00
Brenda Wallace
e8865ba528 More alerty message about no messages 2019-06-12 12:36:56 +12:00
Brenda Wallace
e56133a944 Delete percy_new_spec.rb 2019-06-12 12:10:02 +12:00
Brenda Wallace
64dcb62c03 Fix tabulated 2019-06-12 11:24:16 +12:00
Brenda Wallace
b52dc34381 Header on notifications 2019-06-12 11:22:25 +12:00
Brenda Wallace
2d9d8c45a2 Update index.html.haml 2019-06-12 11:21:07 +12:00
Brenda Wallace
accf549e58 Delete percy-new.sh 2019-06-12 11:18:24 +12:00
Brenda Wallace
a53e9e59a9 Delete .hound.yml 2019-06-12 11:17:54 +12:00
Brenda Wallace
cb84579e78 Delete .mention-bot 2019-06-12 11:17:38 +12:00
Brenda Wallace
690afc1747 One more button from homepage 2019-06-12 09:39:57 +12:00
Brenda Wallace
7cb4bf2314 LArge buttons on home page 2019-06-12 09:39:29 +12:00
Brenda Wallace
4ef16accf6 Merge branch 'dev' into upgrade/bootstrap 2019-06-12 09:36:32 +12:00
Brenda Wallace
4f1eddd631 specs want 30 on a page - so telling the controller 2019-06-12 09:35:51 +12:00
Brenda Wallace
2386fe7afe new hash syntax 2019-06-12 09:27:49 +12:00
Brenda Wallace
040c414827 find translation of some_of_our_crops 2019-06-12 09:27:40 +12:00
dependabot-preview[bot]
85b2d3d2c3 Bump jsonapi-resources from 0.9.7 to 0.9.8
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.7 to 0.9.8.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.7...v0.9.8)
2019-06-11 21:27:11 +00:00
dependabot-preview[bot]
001b8c2079 Bump newrelic_rpm from 6.3.0.355 to 6.4.0.356
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 6.3.0.355 to 6.4.0.356.
- [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.3.0.355...6.4.0.356)
2019-06-11 21:25:24 +00:00
Brenda Wallace
0b44acc90e Merge branch 'dev' into upgrade/bootstrap 2019-06-12 09:23:41 +12:00
Brenda Wallace
d44d6a0b19 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-12 09:23:10 +12:00
codefactor-io
571f4298bb [CodeFactor] Apply fixes 2019-06-11 21:22:53 +00:00
Brenda Wallace
4086e6dd00 remove comments from json 2019-06-12 09:22:33 +12:00
Brenda Wallace
4b7705fcad wrap a context link in before in specs 2019-06-12 09:20:32 +12:00
Brenda Wallace
ee152b3ba3 Match sign in for to the older labels, so tests pass without changes 2019-06-12 09:20:09 +12:00
Brenda Wallace
78f3badcd7 upgrade rubocop 2019-06-12 09:12:23 +12:00
Brenda Wallace
7e3d43c47c add missing translations for buttons 2019-06-12 09:10:37 +12:00
Brenda Wallace
c80cbf203c follow, edit, and message buttons on members#show 2019-06-12 09:10:25 +12:00
Brenda Wallace
b92cef4c02 view all buttons on home page 2019-06-12 09:10:07 +12:00
dependabot-preview[bot]
4d2318ea68 Bump searchkick from 4.0.1 to 4.0.2
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.0.1 to 4.0.2.
- [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.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-10 23:21:07 +00:00
dependabot-preview[bot]
16f981813a Bump haml from 5.0.4 to 5.1.1
Bumps [haml](https://github.com/haml/haml) from 5.0.4 to 5.1.1.
- [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.0.4...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-10 22:41:05 +00:00
Brenda Wallace
0d02f5758b actions menu for harvests 2019-06-09 15:53:01 +12:00
Brenda Wallace
b617468e26 remove commented out code 2019-06-09 14:03:20 +12:00
Brenda Wallace
8762b11555 tidy plantings action menu 2019-06-09 14:02:55 +12:00
Brenda Wallace
7bc641fb55 fix gardens action menu 2019-06-09 14:02:41 +12:00