Commit Graph

6818 Commits

Author SHA1 Message Date
Brenda Wallace
52edaae43b update harvest spec to find edit behind actions menu 2019-06-13 23:05:59 +12:00
Brenda Wallace
a25955714d class on member link, so spec finds it 2019-06-13 23:04:06 +12:00
Brenda Wallace
fbef77b5d0 Fix members list spec, and DRY 2019-06-13 23:00:54 +12:00
Brenda Wallace
8e986ff2c3 consistent use of card-link on crops#show 2019-06-13 22:31:53 +12:00
Brenda Wallace
37e87d3744 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-13 21:45:48 +12:00
Brenda Wallace
e801a1d7c6 Removing unused views 2019-06-13 21:06:10 +12:00
Brenda Wallace
82661c577c Removing comments views 2019-06-13 21:05:29 +12:00
Brenda Wallace
92ae1a7bd2 Merge branch 'dev' into upgrade/bootstrap 2019-06-13 20:52:25 +12:00
Brenda Wallace
d551a99da6 set text in post body to find in post rss spec 2019-06-13 20:51:27 +12:00
Brenda Wallace
220db5d28c Merge branch 'master' into dev 2019-06-13 20:36:24 +12:00
Brenda Wallace
10475cb711 Matching labels on seeds form to specs 2019-06-13 20:32:00 +12:00
Brenda Wallace
6825f8810f tidy up seeds form 2019-06-13 20:01:21 +12:00
Daniel O'Connor
949c57bf7d Line length 2019-06-13 07:58:52 +00:00
Daniel O'Connor
a1cdc2ee93 Passing rubocop 2019-06-13 07:58:52 +00:00
Daniel O'Connor
7bfb2061e1 Passing rubocop 2019-06-13 07:58:52 +00:00
Daniel O'Connor
f1ebc35e53 Rubocop fixes 2019-06-13 07:58:52 +00:00
Daniel O'Connor
28f262368b Rubocop fix 2019-06-13 07:58:52 +00:00
Daniel O'Connor
fedcaae08f Upgraded rubocop configuration 2019-06-13 07:58:52 +00:00
Brenda Wallace
331f568b4c upgrade rubocop 2019-06-13 07:58:52 +00:00
Brenda Wallace
6c49f1768c add extra click into spec 2019-06-13 19:51:18 +12:00
Brenda Wallace
740fdb3ec5 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-13 19:43:53 +12:00
Brenda Wallace
62fb1142b2 Merge branch 'dev' into upgrade/bootstrap 2019-06-13 17:53:51 +12:00
Daniel O'Connor
0bdddf8207 Merge pull request #1981 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.8
Bump jsonapi-resources from 0.9.7 to 0.9.8
2019-06-13 14:49:28 +09:30
Daniel O'Connor
dcc10273ef Update search placeholder 2019-06-13 13:59:19 +09:30
Daniel O'Connor
347dfc3258 Apply similar layout to app/views/crops/index.html.haml 2019-06-13 13:56:53 +09:30
Daniel O'Connor
a26003940d Crop search result page - doubled breadcrumbs 2019-06-13 13:54:59 +09:30
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