Daniel O'Connor
2cdf84a7a2
Merge pull request #3211 from Growstuff/dev
...
Production release 51
2023-03-13 12:04:15 +10:30
dependabot[bot]
8d22a23770
Merge pull request #3273 from Growstuff/dependabot/bundler/rubocop-rspec-2.19.0
2023-03-09 11:25:43 +00:00
dependabot[bot]
43c501f245
Bump rubocop-rspec from 2.18.1 to 2.19.0
...
Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec ) from 2.18.1 to 2.19.0.
- [Release notes](https://github.com/rubocop/rubocop-rspec/releases )
- [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.18.1...v2.19.0 )
---
updated-dependencies:
- dependency-name: rubocop-rspec
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-09 11:02:48 +00:00
dependabot[bot]
525871dde7
Merge pull request #3271 from Growstuff/dependabot/bundler/cancancan-3.5.0
2023-03-09 11:01:12 +00:00
dependabot[bot]
c353b8d32e
Bump cancancan from 3.4.0 to 3.5.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.4.0...3.5.0 )
---
updated-dependencies:
- dependency-name: cancancan
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-09 10:42:17 +00:00
dependabot[bot]
e4e9cd6c2c
Merge pull request #3272 from Growstuff/dependabot/bundler/rubocop-1.48.0
2023-03-09 10:41:26 +00:00
dependabot[bot]
0813beb146
Bump rubocop from 1.47.0 to 1.48.0
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.47.0 to 1.48.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.47.0...v1.48.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-07 07:57:00 +00:00
dependabot[bot]
c6a5a842fc
Merge pull request #3264 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-ccf9415
2023-03-05 01:31:48 +00:00
dependabot[bot]
a374312773
Bump comfortable_mexican_sofa from 456fb85 to ccf9415
...
Bumps [comfortable_mexican_sofa](https://github.com/restarone/comfortable-mexican-sofa ) from `456fb85` to `ccf9415`.
- [Release notes](https://github.com/restarone/comfortable-mexican-sofa/releases )
- [Commits](456fb8507e...ccf9415ae2 )
---
updated-dependencies:
- dependency-name: comfortable_mexican_sofa
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-04 09:55:42 +00:00
dependabot[bot]
189098a5eb
Merge pull request #3268 from Growstuff/dependabot/bundler/rubocop-1.47.0
2023-03-04 09:54:42 +00:00
dependabot[bot]
eef23ca9af
Bump rubocop from 1.46.0 to 1.47.0
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.46.0 to 1.47.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.46.0...v1.47.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-04 09:26:56 +00:00
dependabot[bot]
202e3fd91b
Merge pull request #3267 from Growstuff/dependabot/bundler/puma-6.1.1
2023-03-04 09:25:39 +00:00
dependabot[bot]
ad95f81d31
Bump puma from 6.1.0 to 6.1.1
...
Bumps [puma](https://github.com/puma/puma ) from 6.1.0 to 6.1.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/v6.1.0...v6.1.1 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-01 07:57:41 +00:00
dependabot[bot]
7edc6f9c55
Merge pull request #3265 from Growstuff/dependabot/bundler/rubocop-rails-2.18.0
2023-02-27 09:49:52 +00:00
dependabot[bot]
f0b34801ff
Bump rubocop-rails from 2.17.4 to 2.18.0
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.17.4 to 2.18.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.17.4...v2.18.0 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-27 09:30:12 +00:00
dependabot[bot]
5e9cd98176
Merge pull request #3266 from Growstuff/dependabot/bundler/pg-1.4.6
2023-02-27 09:03:52 +00:00
dependabot[bot]
05e83e4906
Bump pg from 1.4.5 to 1.4.6
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.5...v1.4.6 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-27 07:57:38 +00:00
dependabot[bot]
1e2143082b
Merge pull request #3262 from Growstuff/dependabot/bundler/rubocop-1.46.0
2023-02-25 08:05:06 +00:00
dependabot[bot]
4d63810280
Bump rubocop from 1.45.1 to 1.46.0
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.45.1 to 1.46.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.45.1...v1.46.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-25 07:48:47 +00:00
Daniel O'Connor
2f4416a9a6
Merge pull request #3263 from Growstuff/dependabot/bundler/active_utils-3.4.0
...
Bump active_utils from 3.3.19 to 3.4.0
2023-02-25 17:20:59 +10:30
dependabot[bot]
7d71baf46e
Bump active_utils from 3.3.19 to 3.4.0
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.19 to 3.4.0.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.19...v3.4.0 )
---
updated-dependencies:
- dependency-name: active_utils
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-24 07:16:07 +00:00
dependabot[bot]
7754716b0e
Merge pull request #3258 from Growstuff/dependabot/bundler/dalli-3.2.4
2023-02-22 09:57:19 +00:00
dependabot[bot]
d240b32c7d
Bump dalli from 3.2.3 to 3.2.4
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/main/CHANGELOG.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v3.2.3...v3.2.4 )
---
updated-dependencies:
- dependency-name: dalli
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-22 09:39:13 +00:00
dependabot[bot]
a9ee484e63
Merge pull request #3261 from Growstuff/dependabot/bundler/sidekiq-7.0.6
2023-02-22 09:38:03 +00:00
dependabot[bot]
0d8722af46
Bump sidekiq from 7.0.5 to 7.0.6
...
Bumps [sidekiq](https://github.com/sidekiq/sidekiq ) from 7.0.5 to 7.0.6.
- [Release notes](https://github.com/sidekiq/sidekiq/releases )
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.0.5...v7.0.6 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-22 07:15:31 +00:00
dependabot[bot]
9c8def5f0f
Merge pull request #3259 from Growstuff/dependabot/bundler/devise-4.9.0
2023-02-20 11:09:30 +00:00
dependabot[bot]
debc0b10a6
Bump devise from 4.8.1 to 4.9.0
...
Bumps [devise](https://github.com/heartcombo/devise ) from 4.8.1 to 4.9.0.
- [Release notes](https://github.com/heartcombo/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md )
- [Commits](https://github.com/heartcombo/devise/compare/v4.8.1...v4.9.0 )
---
updated-dependencies:
- dependency-name: devise
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-20 10:45:45 +00:00
dependabot[bot]
3287ca42fb
Merge pull request #3260 from Growstuff/dependabot/bundler/selenium-webdriver-4.8.1
2023-02-20 10:44:37 +00:00
dependabot[bot]
c07f0370ae
Bump selenium-webdriver from 4.8.0 to 4.8.1
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.8.0...selenium-4.8.1 )
---
updated-dependencies:
- dependency-name: selenium-webdriver
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-20 08:01:34 +00:00
dependabot[bot]
ab8f0ee43e
Merge pull request #3257 from Growstuff/dependabot/bundler/sidekiq-7.0.5
2023-02-16 11:51:39 +00:00
dependabot[bot]
55a133a043
Bump sidekiq from 7.0.4 to 7.0.5
...
Bumps [sidekiq](https://github.com/sidekiq/sidekiq ) from 7.0.4 to 7.0.5.
- [Release notes](https://github.com/sidekiq/sidekiq/releases )
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.0.4...v7.0.5 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-16 07:57:08 +00:00
dependabot[bot]
dfbe9a1cb2
Merge pull request #3256 from Growstuff/dependabot/bundler/rack-cors-2.0.0
2023-02-15 08:40:05 +00:00
dependabot[bot]
63681bd595
Bump rack-cors from 1.1.1 to 2.0.0
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/cyu/rack-cors/releases )
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/cyu/rack-cors/compare/v1.1.1...2.0.0 )
---
updated-dependencies:
- dependency-name: rack-cors
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-15 07:57:04 +00:00
dependabot[bot]
b2deaed673
Merge pull request #3255 from Growstuff/dependabot/bundler/sidekiq-7.0.4
2023-02-14 12:24:52 +00:00
dependabot[bot]
ff780971d3
Bump sidekiq from 7.0.3 to 7.0.4
...
Bumps [sidekiq](https://github.com/sidekiq/sidekiq ) from 7.0.3 to 7.0.4.
- [Release notes](https://github.com/sidekiq/sidekiq/releases )
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.0.3...v7.0.4 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-14 07:58:08 +00:00
dependabot[bot]
292fcc81c9
Merge pull request #3253 from Growstuff/dependabot/bundler/oj-3.14.2
2023-02-13 10:51:43 +00:00
dependabot[bot]
7500138704
Bump oj from 3.14.1 to 3.14.2
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.14.1 to 3.14.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.14.1...v3.14.2 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-13 10:34:56 +00:00
Daniel O'Connor
743f0dbd86
Merge pull request #3254 from Growstuff/dependabot/bundler/puma-6.1.0
...
Bump puma from 6.0.2 to 6.1.0
2023-02-13 21:03:37 +10:30
dependabot[bot]
0d619aed02
Bump puma from 6.0.2 to 6.1.0
...
Bumps [puma](https://github.com/puma/puma ) from 6.0.2 to 6.1.0.
- [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/v6.0.2...v6.1.0 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-13 07:58:51 +00:00
dependabot[bot]
49891781d9
Merge pull request #3252 from Growstuff/dependabot/bundler/rubocop-1.45.1
2023-02-09 08:38:41 +00:00
dependabot[bot]
9bd054f1da
Bump rubocop from 1.44.1 to 1.45.1
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.44.1 to 1.45.1.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.44.1...v1.45.1 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-09 07:02:06 +00:00
dependabot[bot]
60d19806ee
Merge pull request #3251 from Growstuff/dependabot/bundler/leaflet-rails-1.9.3
2023-02-07 10:42:33 +00:00
dependabot[bot]
371dfffcbd
Bump leaflet-rails from 1.9.2 to 1.9.3
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.9.2...v1.9.3 )
---
updated-dependencies:
- dependency-name: leaflet-rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-07 07:01:56 +00:00
dependabot[bot]
ffe1936991
Merge pull request #3250 from Growstuff/dependabot/bundler/faker-3.1.1
2023-02-06 10:31:20 +00:00
dependabot[bot]
09663c163e
Bump faker from 3.1.0 to 3.1.1
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v3.1.0...v3.1.1 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-06 10:09:26 +00:00
dependabot[bot]
bdff923a9c
Merge pull request #3249 from Growstuff/dependabot/bundler/responders-3.1.0
2023-02-06 10:05:53 +00:00
dependabot[bot]
1a6095fdc8
Bump responders from 3.0.1 to 3.1.0
...
Bumps [responders](https://github.com/heartcombo/responders ) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/heartcombo/responders/releases )
- [Changelog](https://github.com/heartcombo/responders/blob/main/CHANGELOG.md )
- [Commits](https://github.com/heartcombo/responders/compare/v3.0.1...v3.1.0 )
---
updated-dependencies:
- dependency-name: responders
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-06 07:01:56 +00:00
Daniel O'Connor
112be56a42
Merge pull request #3248 from Growstuff/dependabot/bundler/oj-3.14.1
...
Bump oj from 3.14.0 to 3.14.1
2023-02-04 15:49:39 +10:30
dependabot[bot]
2c4d8ec56b
Bump oj from 3.14.0 to 3.14.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.14.0 to 3.14.1.
- [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.14.0...v3.14.1 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-02 07:01:45 +00:00
dependabot[bot]
9c2a830d23
Merge pull request #3246 from Growstuff/dependabot/bundler/oj-3.14.0
2023-01-31 12:16:47 +00:00
dependabot[bot]
055408a3ef
Bump oj from 3.13.23 to 3.14.0
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.23 to 3.14.0.
- [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.13.23...v3.14.0 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-31 07:01:45 +00:00
dependabot[bot]
35e5737ab4
Merge pull request #3245 from Growstuff/dependabot/bundler/haml_lint-0.45.0
2023-01-30 09:42:51 +00:00
dependabot[bot]
7a79beb842
Bump haml_lint from 0.43.0 to 0.45.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.43.0 to 0.45.0.
- [Release notes](https://github.com/sds/haml-lint/releases )
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sds/haml-lint/compare/v0.43.0...v0.45.0 )
---
updated-dependencies:
- dependency-name: haml_lint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-30 07:03:45 +00:00
dependabot[bot]
f6dc73226e
Merge pull request #3243 from Growstuff/dependabot/bundler/rails-7.0.4.2
2023-01-26 08:40:44 +00:00
dependabot[bot]
cec5768934
Bump rails from 7.0.4.1 to 7.0.4.2
...
Bumps [rails](https://github.com/rails/rails ) from 7.0.4.1 to 7.0.4.2.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v7.0.4.1...v7.0.4.2 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-26 08:18:51 +00:00
dependabot[bot]
dee4a814c9
Merge pull request #3244 from Growstuff/dependabot/bundler/rubocop-1.44.1
2023-01-26 08:12:18 +00:00
dependabot[bot]
8059f6c3a5
Bump rubocop from 1.44.0 to 1.44.1
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.44.0 to 1.44.1.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.44.0...v1.44.1 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-26 07:00:55 +00:00
Cesy
ff8ef0c963
Merge pull request #3240 from Growstuff/dependabot/bundler/chartkick-5.0.1
...
Bump chartkick from 4.2.1 to 5.0.1
2023-01-24 16:01:06 +00:00
dependabot[bot]
8a6c661ff1
Bump chartkick from 4.2.1 to 5.0.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 4.2.1 to 5.0.1.
- [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/v4.2.1...v5.0.1 )
---
updated-dependencies:
- dependency-name: chartkick
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-24 08:52:26 +00:00
dependabot[bot]
5a03b24f4e
Merge pull request #3242 from Growstuff/dependabot/bundler/selenium-webdriver-4.8.0
2023-01-24 08:51:07 +00:00
dependabot[bot]
086f32e473
Bump selenium-webdriver from 4.7.1 to 4.8.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 4.7.1 to 4.8.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.8.0 )
---
updated-dependencies:
- dependency-name: selenium-webdriver
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-24 08:35:10 +00:00
dependabot[bot]
95ca08eb43
Merge pull request #3241 from Growstuff/dependabot/bundler/rubocop-1.44.0
2023-01-24 08:34:00 +00:00
dependabot[bot]
4c0f5fed10
Bump rubocop from 1.43.0 to 1.44.0
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.43.0 to 1.44.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.43.0...v1.44.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-24 07:02:00 +00:00
dependabot[bot]
2a9478206f
Merge pull request #3239 from Growstuff/dependabot/bundler/rubocop-rspec-2.18.1
2023-01-21 12:04:09 +00:00
dependabot[bot]
58beba9dd9
Bump rubocop-rspec from 2.16.0 to 2.18.1
...
Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec ) from 2.16.0 to 2.18.1.
- [Release notes](https://github.com/rubocop/rubocop-rspec/releases )
- [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.16.0...v2.18.1 )
---
updated-dependencies:
- dependency-name: rubocop-rspec
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-20 14:26:34 +00:00
dependabot[bot]
3eb708b954
Merge pull request #3229 from Growstuff/dependabot/bundler/listen-3.8.0
2023-01-20 14:25:17 +00:00
dependabot[bot]
103d7f2235
Bump listen from 3.7.1 to 3.8.0
...
Bumps [listen](https://github.com/guard/listen ) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.7.1...v3.8.0 )
---
updated-dependencies:
- dependency-name: listen
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-19 11:45:34 +00:00
dependabot[bot]
91e90b3cbe
Merge pull request #3237 from Growstuff/dependabot/bundler/faraday-1.10.3
2023-01-19 11:44:24 +00:00
dependabot[bot]
c7551b5856
Bump faraday from 1.10.2 to 1.10.3
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v1.10.2...v1.10.3 )
---
updated-dependencies:
- dependency-name: faraday
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-19 11:25:24 +00:00
dependabot[bot]
d6c75f541a
Merge pull request #3230 from Growstuff/dependabot/bundler/rubocop-1.43.0
2023-01-19 11:24:12 +00:00
dependabot[bot]
218da856c2
Bump rubocop from 1.42.0 to 1.43.0
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.42.0 to 1.43.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.42.0...v1.43.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-19 11:08:09 +00:00
dependabot[bot]
d303adb05c
Merge pull request #3231 from Growstuff/dependabot/bundler/sidekiq-7.0.3
2023-01-19 11:04:51 +00:00
dependabot[bot]
5f8ef59606
Bump sidekiq from 7.0.2 to 7.0.3
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v7.0.2...v7.0.3 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-19 10:48:24 +00:00
dependabot[bot]
e5b192a036
Merge pull request #3234 from Growstuff/dependabot/bundler/rails-7.0.4.1
2023-01-19 10:47:05 +00:00
dependabot[bot]
609a67c180
Bump rails from 7.0.4 to 7.0.4.1
...
Bumps [rails](https://github.com/rails/rails ) from 7.0.4 to 7.0.4.1.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v7.0.4...v7.0.4.1 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-19 10:29:49 +00:00
dependabot[bot]
888cad50b8
Merge pull request #3235 from Growstuff/dependabot/bundler/rack-2.2.6.2
2023-01-19 10:28:31 +00:00
dependabot[bot]
50d1ab2d9a
Bump rack from 2.2.4 to 2.2.6.2
...
Bumps [rack](https://github.com/rack/rack ) from 2.2.4 to 2.2.6.2.
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.2.4...v2.2.6.2 )
---
updated-dependencies:
- dependency-name: rack
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-19 00:47:23 +00:00
dependabot[bot]
f0992c9d7a
Merge pull request #3228 from Growstuff/dependabot/bundler/bullet-7.0.7
2023-01-07 07:06:18 +00:00
dependabot[bot]
28c84e4b9d
Bump bullet from 7.0.5 to 7.0.7
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 7.0.5 to 7.0.7.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.5...7.0.7 )
---
updated-dependencies:
- dependency-name: bullet
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-03 20:16:03 +00:00
Cesy
9b06e3bf79
Merge pull request #3227 from Growstuff/dependabot/bundler/httparty-0.21.0
...
Bump httparty from 0.18.1 to 0.21.0
2023-01-03 20:14:37 +00:00
dependabot[bot]
7827cda1f7
Bump httparty from 0.18.1 to 0.21.0
...
Bumps [httparty](https://github.com/jnunemaker/httparty ) from 0.18.1 to 0.21.0.
- [Release notes](https://github.com/jnunemaker/httparty/releases )
- [Changelog](https://github.com/jnunemaker/httparty/blob/master/Changelog.md )
- [Commits](https://github.com/jnunemaker/httparty/compare/v0.18.1...v0.21.0 )
---
updated-dependencies:
- dependency-name: httparty
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-03 15:34:08 +00:00
dependabot[bot]
09f0a303cf
Merge pull request #3224 from Growstuff/dependabot/bundler/bullet-7.0.5
2023-01-03 01:16:15 +00:00
dependabot[bot]
3823981b5a
Bump bullet from 7.0.4 to 7.0.5
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 7.0.4 to 7.0.5.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.4...7.0.5 )
---
updated-dependencies:
- dependency-name: bullet
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-03 00:53:18 +00:00
dependabot[bot]
f09a17f36a
Merge pull request #3223 from Growstuff/dependabot/bundler/rubocop-1.42.0
2023-01-03 00:52:28 +00:00
dependabot[bot]
9ba879a458
Bump rubocop from 1.41.1 to 1.42.0
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.41.1 to 1.42.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.41.1...v1.42.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-03 00:36:17 +00:00
dependabot[bot]
2b41612036
Merge pull request #3225 from Growstuff/dependabot/bundler/puma-6.0.2
2023-01-03 00:35:23 +00:00
dependabot[bot]
eeb62c488a
Bump puma from 6.0.1 to 6.0.2
...
Bumps [puma](https://github.com/puma/puma ) from 6.0.1 to 6.0.2.
- [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/v6.0.1...v6.0.2 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-02 07:02:55 +00:00
Cesy
cf224e185f
Merge pull request #3222 from Growstuff/dependabot/bundler/rubocop-rails-2.17.4
...
Bump rubocop-rails from 2.17.3 to 2.17.4
2022-12-26 11:05:36 +00:00
dependabot[bot]
913cb48be8
Bump rubocop-rails from 2.17.3 to 2.17.4
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.17.3 to 2.17.4.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.17.3...v2.17.4 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-26 10:40:36 +00:00
Cesy
2ac0e6ff65
Merge pull request #3221 from Growstuff/dependabot/bundler/faker-3.1.0
...
Bump faker from 3.0.0 to 3.1.0
2022-12-26 10:39:50 +00:00
dependabot[bot]
05cbed55d1
Bump faker from 3.0.0 to 3.1.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v3.0.0...v3.1.0 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-26 07:00:44 +00:00
dependabot[bot]
cc844f0a80
Merge pull request #3220 from Growstuff/dependabot/bundler/rubocop-1.41.1
2022-12-23 03:01:49 +00:00
dependabot[bot]
f0667cdbf5
Bump rubocop from 1.40.0 to 1.41.1
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.40.0 to 1.41.1.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.40.0...v1.41.1 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-23 02:43:35 +00:00
dependabot[bot]
4db6a5adc6
Merge pull request #3219 from Growstuff/dependabot/bundler/puma-6.0.1
2022-12-23 02:42:35 +00:00
dependabot[bot]
c4dfa09e49
Bump puma from 6.0.0 to 6.0.1
...
Bumps [puma](https://github.com/puma/puma ) from 6.0.0 to 6.0.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/v6.0.0...v6.0.1 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-21 07:02:10 +00:00
Cesy
ff345de507
Merge pull request #3214 from Growstuff/dependabot/bundler/rack-protection-3.0.5
...
Bump rack-protection from 3.0.4 to 3.0.5
2022-12-19 08:47:12 +00:00
dependabot[bot]
145ae184ac
Bump rack-protection from 3.0.4 to 3.0.5
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v3.0.4...v3.0.5 )
---
updated-dependencies:
- dependency-name: rack-protection
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-19 07:01:22 +00:00
Daniel O'Connor
a60f7c2db0
Merge pull request #3212 from Growstuff/CloCkWeRX-patch-1
...
Update swagger.json - Remove duplicates, add basic docs
2022-12-18 21:07:18 +10:30
Cesy
f279eddafa
Merge branch 'dev' into CloCkWeRX-patch-1
2022-12-18 10:14:49 +00:00
Cesy
3f09805bfd
Merge pull request #3213 from Growstuff/revert-3208-reupgrade-ruby
...
Revert "Reupgrade ruby"
2022-12-18 10:14:18 +00:00
Cesy
4830228436
Revert "Reupgrade ruby"
2022-12-18 10:09:00 +00:00
Cesy
90a86d8db4
Merge branch 'dev' into CloCkWeRX-patch-1
2022-12-18 09:42:16 +00:00
Cesy
850823563c
Merge pull request #3208 from cesy/reupgrade-ruby
...
Reupgrade ruby
2022-12-18 09:41:57 +00:00
Daniel O'Connor
c98731eea1
Merge branch 'dev' into reupgrade-ruby
2022-12-18 14:47:47 +10:30
Daniel O'Connor
f81493deaa
Merge pull request #3203 from cesy/bundleupdate3
...
Empty fails on nil, better to use present instead
2022-12-18 13:59:46 +10:30
Daniel O'Connor
d5ecdb9838
Update swagger.json
2022-12-18 13:55:39 +10:30
Daniel O'Connor
5e5b9748d7
Merge branch 'dev' into bundleupdate3
2022-12-18 13:38:41 +10:30
Daniel O'Connor
5618e9565f
Merge pull request #3207 from Growstuff/issue/2743
...
Issue/2743: Remove doubled crops entry
2022-12-18 13:38:27 +10:30
Daniel O'Connor
c1e511d099
Merge branch 'dev' into bundleupdate3
2022-12-18 11:45:10 +10:30
Daniel O'Connor
dfc7d1a09a
Merge branch 'dev' into issue/2743
2022-12-18 11:44:52 +10:30
Daniel O'Connor
13b99b468b
Merge pull request #3196 from italopires/fix-warning-link-capybara
...
Issue/3155: Fix capybara link warning
2022-12-18 11:44:33 +10:30
Cesy
cceda77471
Merge branch 'dev' into fix-warning-link-capybara
2022-12-17 17:59:16 +00:00
Cesy
64331cb8bd
Merge pull request #3192 from Growstuff/issue/1642
...
Issue/1642: Drop facebook auth
2022-12-17 10:45:30 +00:00
Cesy
3bf0ece501
Merge branch 'dev' into fix-warning-link-capybara
2022-12-17 10:42:40 +00:00
Cesy
60608411ed
Merge branch 'dev' into issue/1642
2022-12-17 10:41:35 +00:00
Cesy
554620e8ce
Merge pull request #3176 from Growstuff/dev
...
Production release
2022-12-17 10:38:50 +00:00
Daniel O'Connor
f54ac547e2
Merge pull request #3210 from Growstuff/dependabot/bundler/haml_lint-0.43.0
...
Bump haml_lint from 0.42.0 to 0.43.0
2022-12-17 10:56:33 +10:30
dependabot[bot]
baeb3a109d
Bump haml_lint from 0.42.0 to 0.43.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.42.0 to 0.43.0.
- [Release notes](https://github.com/sds/haml-lint/releases )
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sds/haml-lint/compare/v0.42.0...v0.43.0 )
---
updated-dependencies:
- dependency-name: haml_lint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-16 07:01:08 +00:00
Cesy
5025f6c3f0
Revert "Revert "Finishing updating ruby""
...
This reverts commit 2eaf9ca400 .
2022-12-15 13:42:07 +00:00
Cesy
0938e6b7a9
Revert "Revert "Update ruby version to 3.1.3""
...
This reverts commit d479c0d906 .
2022-12-15 13:41:34 +00:00
Daniel O'Connor
cdd0a7c122
Merge branch 'dev' into issue/2743
2022-12-16 00:03:10 +10:30
Cesy
13eea12d1e
Merge pull request #3204 from cesy/mailgun
...
Switching from SendGrid to Mailgun for sending emails
2022-12-15 13:23:36 +00:00
Daniel O'Connor
7733cd9bd2
Merge branch 'dev' into fix-warning-link-capybara
2022-12-15 22:36:55 +10:30
Daniel O'Connor
0a9afe03d9
Fix #2743 Remove doubled crops entry
2022-12-15 22:28:54 +10:30
Daniel O'Connor
1d92230a21
Merge branch 'dev' into mailgun
2022-12-15 22:23:59 +10:30
Daniel O'Connor
df5d5cc305
Lock to a platform to work around Heroku's failure to listen to our configuration
2022-12-15 22:20:07 +10:30
Cesy
10a721e1c1
Merge pull request #3202 from cesy/upgrade-bootstrap
...
Fixing vulnerabilities in old versions of gems
2022-12-15 10:54:48 +00:00
Cesy
59c212ecf5
Switching from SendGrid to Mailgun for sending emails
2022-12-15 10:35:52 +00:00
Cesy
796823cf53
Merge branch 'dev' into upgrade-bootstrap
2022-12-15 10:26:20 +00:00
Daniel O'Connor
860d316e63
Merge pull request #3200 from cesy/downgrade-ruby
...
Downgrade ruby
2022-12-15 19:49:31 +10:30
Daniel O'Connor
db8b9ca99f
Merge branch 'dev' into upgrade-bootstrap
2022-12-15 19:48:58 +10:30
Daniel O'Connor
7a8f826456
Merge branch 'dev' into bundleupdate3
2022-12-15 19:45:08 +10:30
Daniel O'Connor
ede42e1f0b
Merge branch 'dev' into downgrade-ruby
2022-12-15 19:44:26 +10:30
Cesy Avon
f677500d2e
Empty fails on nil, better to use present instead
2022-12-14 20:18:49 +00:00
Cesy
d3107f4dcd
Fixing vulnerabilities in old versions of gems
2022-12-14 19:55:54 +00:00
Cesy
f041af386f
Merge pull request #3201 from Growstuff/dependabot/bundler/rails-html-sanitizer-1.4.4
...
Bump rails-html-sanitizer from 1.4.3 to 1.4.4
2022-12-14 19:25:32 +00:00
dependabot[bot]
80fe8ded45
Bump rails-html-sanitizer from 1.4.3 to 1.4.4
...
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer ) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases )
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4 )
---
updated-dependencies:
- dependency-name: rails-html-sanitizer
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-14 18:54:48 +00:00
Cesy
2c9d81d749
Merge pull request #3198 from Growstuff/dependabot/bundler/rubocop-rspec-2.16.0
...
Bump rubocop-rspec from 2.15.0 to 2.16.0
2022-12-14 18:53:52 +00:00
Cesy
b167e40c27
Making codeclimate happier
2022-12-14 18:25:36 +00:00
dependabot[bot]
cf2b08c602
Bump rubocop-rspec from 2.15.0 to 2.16.0
...
Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec ) from 2.15.0 to 2.16.0.
- [Release notes](https://github.com/rubocop/rubocop-rspec/releases )
- [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.15.0...v2.16.0 )
---
updated-dependencies:
- dependency-name: rubocop-rspec
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-14 18:22:23 +00:00
Cesy
e2b4ab1de0
Merge pull request #3197 from Growstuff/dependabot/bundler/loofah-2.19.1
...
Bump loofah from 2.19.0 to 2.19.1
2022-12-14 18:21:23 +00:00
Cesy
d479c0d906
Revert "Update ruby version to 3.1.3"
...
This reverts commit 34daa5b9ec .
2022-12-14 18:14:09 +00:00
Cesy
2eaf9ca400
Revert "Finishing updating ruby"
...
This reverts commit 19502c997d .
2022-12-14 18:09:11 +00:00
Cesy
2e2126551e
Revert "Apply suggestions from code review"
...
This reverts commit 3f6f687ab5 .
2022-12-14 18:08:41 +00:00
dependabot[bot]
006da313a5
Bump loofah from 2.19.0 to 2.19.1
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.19.0 to 2.19.1.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.19.0...v2.19.1 )
---
updated-dependencies:
- dependency-name: loofah
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-13 20:53:47 +00:00
Italo Pires
8951ae4719
Added myself to CONTRIBUTORS.md
2022-12-12 15:30:41 -03:00
Italo Pires
5faf990167
Removed white space
2022-12-10 18:50:17 -03:00
Italo Pires
24ac3fc9be
Rename it from shows to render
2022-12-10 18:42:13 -03:00
Italo Pires
74f2ffe86e
Fix test warning about assert link with capybara
2022-12-10 18:38:11 -03:00
Daniel O'Connor
fec76aea67
Merge pull request #3195 from cesy/update-ruby
...
Finishing updating ruby
2022-12-10 19:47:18 +10:30
Daniel O'Connor
3f6f687ab5
Apply suggestions from code review
2022-12-10 19:01:29 +10:30
Cesy
e101978107
Merge branch 'dev' into issue/1642
2022-12-10 08:23:36 +00:00
Cesy
c8025ff972
Merge pull request #3188 from Growstuff/issue/2718
...
Apple Favicons - Link fully to the asset version
2022-12-10 08:23:02 +00:00
Cesy
19502c997d
Finishing updating ruby
2022-12-10 08:22:15 +00:00
Cesy
cec879ab13
Merge branch 'dev' into issue/2718
2022-12-10 07:35:02 +00:00
Cesy
e88be9efc8
Merge pull request #3185 from Growstuff/issue/2743-swagger
...
Fix base path in swagger docs
2022-12-10 07:33:15 +00:00
Daniel O'Connor
dd7c51ea88
Update _edit_apps.html.haml
2022-12-10 16:13:11 +10:30
Daniel O'Connor
2fd478d155
Merge branch 'dev' into issue/1642
2022-12-10 16:00:39 +10:30
Daniel O'Connor
28d550d67f
Drop test
2022-12-10 15:55:57 +10:30
Daniel O'Connor
07feb1cd85
Drop tests
2022-12-10 15:54:58 +10:30
Daniel O'Connor
d3063f844d
Remove facebook auth. They wanted to dictate the behaviour of an application they didn't own, so I told them to get stuffed a few years ago
2022-12-10 15:52:12 +10:30
Daniel O'Connor
9bcdcf5ae7
Merge branch 'dev' into issue/2718
2022-12-10 15:14:32 +10:30
Daniel O'Connor
87ec6d6c6d
Link fully to the asset version
2022-12-10 15:13:42 +10:30
Daniel O'Connor
b426f7c0ef
Merge branch 'dev' into issue/2743-swagger
2022-12-10 10:24:27 +10:30
Daniel O'Connor
4f2343d944
Fix base path
2022-12-10 10:23:00 +10:30
Daniel O'Connor
9f8ca1878d
Merge pull request #3180 from cesy/update-ruby
...
Update ruby version to 3.1.3
2022-12-10 10:17:55 +10:30
dependabot[bot]
5b5861fc9f
Merge pull request #3178 from Growstuff/dependabot/bundler/rubocop-1.40.0
2022-12-09 23:13:16 +00:00
Daniel O'Connor
41837ccaec
Merge branch 'dev' into update-ruby
2022-12-10 09:28:20 +10:30
dependabot[bot]
ff8d5c881a
Bump rubocop from 1.39.0 to 1.40.0
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.39.0 to 1.40.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.39.0...v1.40.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-09 22:57:35 +00:00
Daniel O'Connor
81aa4db927
Merge pull request #3182 from cesy/cesy-upgrade-rails
...
Upgrade rails to 7.0.4
2022-12-10 09:26:46 +10:30
Daniel O'Connor
71708a1b36
Merge branch 'dev' into update-ruby
2022-12-10 09:18:41 +10:30
dependabot[bot]
4839a5818e
Merge pull request #3179 from Growstuff/dependabot/bundler/scout_apm-5.3.3
2022-12-09 22:46:34 +00:00
Daniel O'Connor
4a52b31f4a
Merge branch 'dev' into update-ruby
2022-12-10 08:58:15 +10:30
Daniel O'Connor
d540417ffd
Merge branch 'dev' into cesy-upgrade-rails
2022-12-10 08:58:01 +10:30
dependabot[bot]
2d4a690846
Bump scout_apm from 5.3.2 to 5.3.3
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 5.3.2 to 5.3.3.
- [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/v5.3.2...v5.3.3 )
---
updated-dependencies:
- dependency-name: scout_apm
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-09 22:27:54 +00:00
Daniel O'Connor
2cc286e726
Merge pull request #3181 from cesy/cesy-update-brakeman-ruby
...
Update brakeman ruby
2022-12-10 08:56:58 +10:30
Cesy
4b11dd20fa
Update gemfile.lock for rails upgrade
2022-12-09 19:12:36 +00:00
Cesy
995dedff62
Fixing brakeman's ruby version
2022-12-09 18:27:24 +00:00
Cesy
a4a33ae2b8
Brakeman use current ruby version
2022-12-09 18:23:08 +00:00
Cesy
117115970c
Update rails from 7.0.0 to 7.0.4
2022-12-09 18:02:57 +00:00
Cesy
34daa5b9ec
Update ruby version to 3.1.3
2022-12-09 18:00:29 +00:00
Cesy
325e7aed68
Merge pull request #3177 from Growstuff/dependabot/bundler/nokogiri-1.13.10
...
Bump nokogiri from 1.13.9 to 1.13.10
2022-12-08 07:06:39 +00:00
dependabot[bot]
08eb2e7dc9
Bump nokogiri from 1.13.9 to 1.13.10
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.9 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.9...v1.13.10 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-08 04:30:34 +00:00
Cesy
18e3ba0495
Merge branch 'mainline' into dev
2022-12-05 11:35:02 +00:00
Cesy
2b4494d53d
Merge pull request #3175 from Growstuff/dependabot/bundler/selenium-webdriver-4.7.1
...
Bump selenium-webdriver from 4.7.0 to 4.7.1
2022-12-05 11:32:36 +00:00
dependabot[bot]
04a73fe763
Bump selenium-webdriver from 4.7.0 to 4.7.1
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
---
updated-dependencies:
- dependency-name: selenium-webdriver
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-05 10:40:10 +00:00
Cesy
91ea53f764
Merge pull request #3158 from Growstuff/rubocop-safe
...
Stacked PR: Various rubocop autocorrections
2022-12-05 08:01:34 +00:00
Daniel O'Connor
39f6c27c97
Update lib/actions/oauth_signup_action.rb
...
Co-authored-by: Brenda Wallace <brenda@wallace.net.nz >
2022-12-05 07:48:44 +10:30
Daniel O'Connor
cca0c3efac
Merge branch 'dev' into rubocop-safe
2022-12-03 11:18:56 +10:30
Cesy
ae4cff8bf0
Merge pull request #3170 from Growstuff/dependabot/bundler/material_icons-4.0.0
...
Bump material_icons from 2.2.1 to 4.0.0
2022-12-02 12:09:51 +00:00
dependabot[bot]
5b1db9679a
Bump material_icons from 2.2.1 to 4.0.0
...
Bumps [material_icons](https://github.com/Angelmmiguel/material_icons ) from 2.2.1 to 4.0.0.
- [Release notes](https://github.com/Angelmmiguel/material_icons/releases )
- [Changelog](https://github.com/Angelmmiguel/material_icons/blob/master/changelog.md )
- [Commits](https://github.com/Angelmmiguel/material_icons/compare/v2.2.1...v4.0.0 )
---
updated-dependencies:
- dependency-name: material_icons
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-02 11:35:47 +00:00
Cesy
1450b7ccb4
Merge pull request #3167 from Growstuff/dependabot/bundler/pg-1.4.5
...
Bump pg from 1.4.4 to 1.4.5
2022-12-02 11:34:49 +00:00
dependabot[bot]
e6a52b594d
Bump pg from 1.4.4 to 1.4.5
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.4...v1.4.5 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-02 10:51:55 +00:00
dependabot[bot]
ba8e607c38
Merge pull request #3171 from Growstuff/dependabot/bundler/bullet-7.0.4
2022-12-02 10:50:53 +00:00
dependabot[bot]
1d5dd27b23
Bump bullet from 7.0.3 to 7.0.4
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 7.0.3 to 7.0.4.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.3...7.0.4 )
---
updated-dependencies:
- dependency-name: bullet
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-02 10:33:56 +00:00
dependabot[bot]
ae258f0549
Merge pull request #3169 from Growstuff/dependabot/bundler/rack-protection-3.0.4
2022-12-02 10:32:58 +00:00
dependabot[bot]
2cb64f26ba
Bump rack-protection from 3.0.2 to 3.0.4
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 3.0.2 to 3.0.4.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v3.0.2...v3.0.4 )
---
updated-dependencies:
- dependency-name: rack-protection
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-02 10:16:18 +00:00
dependabot[bot]
8d6b789e84
Merge pull request #3168 from Growstuff/dependabot/bundler/rubocop-rails-2.17.3
2022-12-02 10:09:51 +00:00
dependabot[bot]
5cab917c7b
Bump rubocop-rails from 2.17.2 to 2.17.3
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.17.2 to 2.17.3.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.17.2...v2.17.3 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-02 09:53:29 +00:00
dependabot[bot]
43ccdcb892
Merge pull request #3165 from Growstuff/dependabot/bundler/rswag-specs-2.8.0
2022-12-02 09:52:33 +00:00
dependabot[bot]
eb02e3a738
Bump rswag-specs from 2.7.0 to 2.8.0
...
Bumps [rswag-specs](https://github.com/rswag/rswag ) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.7.0...2.8.0 )
---
updated-dependencies:
- dependency-name: rswag-specs
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-02 09:37:25 +00:00
Daniel O'Connor
54ca363641
Merge pull request #3173 from Growstuff/dependabot/bundler/sidekiq-7.0.2
...
Bump sidekiq from 7.0.1 to 7.0.2
2022-12-02 20:06:36 +10:30
dependabot[bot]
a31bdf72c2
Bump sidekiq from 7.0.1 to 7.0.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v7.0.1...v7.0.2 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-02 08:55:34 +00:00
Cesy
2bb3953255
Merge pull request #3166 from Growstuff/dependabot/bundler/rswag-ui-2.8.0
...
Bump rswag-ui from 2.7.0 to 2.8.0
2022-12-02 08:54:30 +00:00
dependabot[bot]
9b94f3c1a3
Bump rswag-ui from 2.7.0 to 2.8.0
...
Bumps [rswag-ui](https://github.com/rswag/rswag ) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.7.0...2.8.0 )
---
updated-dependencies:
- dependency-name: rswag-ui
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-02 08:24:45 +00:00
Cesy
79cc8bb8ce
Merge pull request #3174 from Growstuff/dependabot/bundler/selenium-webdriver-4.7.0
...
Bump selenium-webdriver from 4.6.1 to 4.7.0
2022-12-02 08:23:49 +00:00
dependabot[bot]
9190e8178b
Bump selenium-webdriver from 4.6.1 to 4.7.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.7.0 )
---
updated-dependencies:
- dependency-name: selenium-webdriver
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-02 07:00:58 +00:00
Cesy
2de6f4ec59
Merge pull request #3164 from Growstuff/dependabot/bundler/rswag-api-2.8.0
...
Bump rswag-api from 2.7.0 to 2.8.0
2022-12-01 14:49:12 +00:00
dependabot[bot]
aba09c9dfe
Bump rswag-api from 2.7.0 to 2.8.0
...
Bumps [rswag-api](https://github.com/rswag/rswag ) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.7.0...2.8.0 )
---
updated-dependencies:
- dependency-name: rswag-api
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-01 13:58:55 +00:00
Cesy
e8e50397ac
Merge pull request #3163 from Growstuff/dependabot/bundler/friendly_id-5.5.0
...
Bump friendly_id from 5.4.2 to 5.5.0
2022-12-01 13:58:04 +00:00
dependabot[bot]
1c223bdd21
Bump friendly_id from 5.4.2 to 5.5.0
...
Bumps [friendly_id](https://github.com/norman/friendly_id ) from 5.4.2 to 5.5.0.
- [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.2...5.5.0 )
---
updated-dependencies:
- dependency-name: friendly_id
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-01 13:15:51 +00:00
Cesy
21b57408c6
Merge pull request #3160 from Growstuff/dependabot/bundler/rubocop-1.39.0
...
Bump rubocop from 1.38.0 to 1.39.0
2022-12-01 13:10:34 +00:00
dependabot[bot]
867df709ec
Bump rubocop from 1.38.0 to 1.39.0
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.38.0 to 1.39.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.38.0...v1.39.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-01 12:04:37 +00:00
Cesy
68c9221b4d
Merge pull request #3162 from Growstuff/dependabot/bundler/leaflet-rails-1.9.2
...
Bump leaflet-rails from 1.8.0 to 1.9.2
2022-12-01 12:02:29 +00:00
dependabot[bot]
440be0f7fd
Bump leaflet-rails from 1.8.0 to 1.9.2
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.8.0 to 1.9.2.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.8.0...v1.9.2 )
---
updated-dependencies:
- dependency-name: leaflet-rails
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-01 09:13:28 +00:00
Cesy
b480129f74
Merge pull request #3159 from Growstuff/dependabot/bundler/jquery-rails-4.5.1
...
Bump jquery-rails from 4.5.0 to 4.5.1
2022-12-01 09:06:03 +00:00
dependabot[bot]
ad48020935
Bump jquery-rails from 4.5.0 to 4.5.1
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v4.5.0...v4.5.1 )
---
updated-dependencies:
- dependency-name: jquery-rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-30 11:15:11 +00:00
dependabot[bot]
29a24cdb0e
Merge pull request #3172 from Growstuff/dependabot/bundler/timecop-0.9.6
2022-11-30 11:09:25 +00:00
dependabot[bot]
c490124b1e
Bump timecop from 0.9.5 to 0.9.6
...
Bumps [timecop](https://github.com/travisjeffery/timecop ) from 0.9.5 to 0.9.6.
- [Release notes](https://github.com/travisjeffery/timecop/releases )
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md )
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.5...v0.9.6 )
---
updated-dependencies:
- dependency-name: timecop
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-30 07:00:41 +00:00
Daniel O'Connor
4a3c211a98
Merge pull request #3031 from Growstuff/bump-ruby-3.1.x
...
Upgrade to Ruby 3.1.2 & rails 7
2022-11-09 12:48:34 +10:30
Daniel O'Connor
33f22dae41
Merge pull request #3156 from Growstuff/dev
...
Deploy: A variety of dependency updates
2022-11-08 21:16:16 +10:30
Daniel O'Connor
d22215f870
Merge branch 'bump-ruby-3.1.x' into rubocop-safe
2022-11-08 00:32:36 +10:30
Daniel O'Connor
13a78b76ee
Mark WIP
2022-11-08 00:31:23 +10:30
Daniel O'Connor
96147809ee
Fix deprecations
2022-11-08 00:30:44 +10:30
Daniel O'Connor
5dc3a7e2f7
Rubocop
2022-11-08 00:25:29 +10:30
Daniel O'Connor
d1f754a288
Rubocop
2022-11-08 00:23:38 +10:30
Daniel O'Connor
2db3d1bacc
Various corrections
2022-11-08 00:21:23 +10:30
Daniel O'Connor
34af93cfc2
Rubocop
2022-11-08 00:19:52 +10:30
Daniel O'Connor
e2942f17c7
Rubocop corrections
2022-11-08 00:18:35 +10:30
Daniel O'Connor
a8b8a58f33
Various rspec autocorrections
2022-11-08 00:09:50 +10:30
Daniel O'Connor
b726f40d9b
Fix deprecation
2022-11-08 00:04:39 +10:30
Daniel O'Connor
0d550134e5
Deprecation
2022-11-08 00:03:36 +10:30
Daniel O'Connor
66018955db
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-08 00:01:05 +10:30
Daniel O'Connor
638fc25dcc
Merge branch 'mainline' into dev
2022-11-08 00:00:29 +10:30
Daniel O'Connor
ace1eebef6
Raise errors on deprecations
2022-11-07 23:58:42 +10:30
Daniel O'Connor
d3df63912c
Typo
2022-11-07 23:56:37 +10:30
Daniel O'Connor
838c9d116e
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-07 23:40:30 +10:30
Daniel O'Connor
0055b6427c
Merge pull request #3144 from Growstuff/dependabot/bundler/rack-protection-3.0.2
...
Bump rack-protection from 2.2.2 to 3.0.2
2022-11-07 23:40:14 +10:30
dependabot[bot]
bad83bb277
Merge pull request #3147 from Growstuff/dependabot/bundler/rswag-api-2.7.0
2022-11-07 13:09:59 +00:00
Daniel O'Connor
df6cf3d0f6
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-07 23:38:27 +10:30
Daniel O'Connor
0aafaba718
Regenerate
2022-11-07 23:36:19 +10:30
Daniel O'Connor
b846d995ef
Regenerate
2022-11-07 23:34:43 +10:30
Daniel O'Connor
7971c23c9c
Rubocop
2022-11-07 23:33:16 +10:30
Daniel O'Connor
82c7c12cbe
Described class
2022-11-07 23:32:12 +10:30
Daniel O'Connor
0843cbde9a
Fix specs
2022-11-07 23:32:05 +10:30
Daniel O'Connor
9c0bc3762c
Fix specs
2022-11-07 23:32:02 +10:30
Daniel O'Connor
89da1af05d
Improve rspec
2022-11-07 23:26:35 +10:30
Daniel O'Connor
2576c8b3b6
Rubocop
2022-11-07 23:22:18 +10:30
Daniel O'Connor
89a2dda637
Revert "Rubocop - auto corrections"
...
This reverts commit 39ea0d4882 .
2022-11-07 23:21:05 +10:30
Daniel O'Connor
06c5e4b8e8
to_s
2022-11-07 23:20:49 +10:30
Daniel O'Connor
cd43e73fd4
to_s
2022-11-07 23:20:49 +10:30
Daniel O'Connor
dae4cacb53
to_s
2022-11-07 23:20:49 +10:30
Daniel O'Connor
8267416da3
TimeWithZone#to_s(:rfc822) is deprecated. Please use TimeWithZone#to_fs(:rfc822) instead.
2022-11-07 23:20:49 +10:30
dependabot[bot]
2aca1c38aa
Bump rswag-api from 2.5.1 to 2.7.0
...
Bumps [rswag-api](https://github.com/rswag/rswag ) from 2.5.1 to 2.7.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.5.1...2.7.0 )
---
updated-dependencies:
- dependency-name: rswag-api
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 12:47:26 +00:00
dependabot[bot]
79ead92522
Bump rack-protection from 2.2.2 to 3.0.2
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.2.2 to 3.0.2.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.2.2...v3.0.2 )
---
updated-dependencies:
- dependency-name: rack-protection
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 12:47:25 +00:00
dependabot[bot]
2400871cc8
Merge pull request #3153 from Growstuff/dependabot/bundler/webdrivers-5.2.0
2022-11-07 12:46:32 +00:00
Daniel O'Connor
48c2a9bde2
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-07 23:01:45 +10:30
dependabot[bot]
9b1b24541c
Bump webdrivers from 5.0.0 to 5.2.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 5.0.0 to 5.2.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases )
- [Changelog](https://github.com/titusfortner/webdrivers/blob/main/CHANGELOG.md )
- [Commits](https://github.com/titusfortner/webdrivers/compare/v5.0.0...v5.2.0 )
---
updated-dependencies:
- dependency-name: webdrivers
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 12:26:31 +00:00
dependabot[bot]
963ee76821
Merge pull request #3148 from Growstuff/dependabot/bundler/dalli-3.2.3
2022-11-07 12:25:36 +00:00
dependabot[bot]
f90785da51
Bump dalli from 3.2.2 to 3.2.3
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/main/CHANGELOG.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v3.2.2...v3.2.3 )
---
updated-dependencies:
- dependency-name: dalli
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 12:09:42 +00:00
Daniel O'Connor
88968ba30e
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-07 22:38:58 +10:30
Daniel O'Connor
ac08aa518a
Merge pull request #3146 from Growstuff/dependabot/bundler/selenium-webdriver-4.6.1
...
Bump selenium-webdriver from 4.4.0 to 4.6.1
2022-11-07 22:38:19 +10:30
Daniel O'Connor
7f0a25af57
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-07 22:34:11 +10:30
Daniel O'Connor
04f9cf1a7e
Rails couldn't find a valid model for SentNotification association. Please provide the :class_name option on the association declaration. If :class_name is already provided, make sure it's an ActiveRecord::Base subclass.
2022-11-07 22:32:37 +10:30
Daniel O'Connor
4045efb9b5
DEPRECATION WARNING: TimeWithZone#to_s(:number) is deprecated. Please use TimeWithZone#to_fs(:number) instead.
2022-11-07 22:28:45 +10:30
Daniel O'Connor
4310a6f717
DEPRECATION WARNING: TimeWithZone#to_s(:number) is deprecated. Please use TimeWithZone#to_fs(:number) instead.
2022-11-07 22:27:45 +10:30
Daniel O'Connor
302483f66d
DEPRECATION WARNING: TimeWithZone#to_s(:number) is deprecated. Please use TimeWithZone#to_fs(:number) instead.
2022-11-07 22:26:57 +10:30
Daniel O'Connor
81fdfbdc0b
DEPRECATION WARNING: Date#to_s(:ymd) is deprecated. Please use Date#to_fs(:ymd) instead.
2022-11-07 22:25:34 +10:30
Daniel O'Connor
f75d2f33a5
DEPRECATION WARNING: TimeWithZone#to_s(:number) is deprecated. Please use TimeWithZone#to_fs(:number) instead.
2022-11-07 22:24:03 +10:30
Daniel O'Connor
7d10067592
Merge branch 'dev' into dependabot/bundler/selenium-webdriver-4.6.1
2022-11-07 22:22:27 +10:30
dependabot[bot]
f259e94b1b
Bump selenium-webdriver from 4.4.0 to 4.6.1
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 4.4.0 to 4.6.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
---
updated-dependencies:
- dependency-name: selenium-webdriver
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 11:52:16 +00:00
Daniel O'Connor
fac059342c
Merge pull request #3150 from Growstuff/dependabot/bundler/geocoder-1.8.1
...
Bump geocoder from 1.8.0 to 1.8.1
2022-11-07 22:22:12 +10:30
Daniel O'Connor
ba8b6f147e
Merge pull request #3149 from Growstuff/dependabot/bundler/loofah-2.19.0
...
Bump loofah from 2.18.0 to 2.19.0
2022-11-07 22:21:58 +10:30
Daniel O'Connor
99a5c5102e
Merge pull request #3151 from Growstuff/dependabot/bundler/i18n-tasks-1.0.12
...
Bump i18n-tasks from 1.0.11 to 1.0.12
2022-11-07 22:21:40 +10:30
Daniel O'Connor
303dfb9173
Merge pull request #3145 from Growstuff/dependabot/bundler/oj-3.13.23
...
Bump oj from 3.13.22 to 3.13.23
2022-11-07 22:21:26 +10:30
Daniel O'Connor
5621666383
DEPRECATION WARNING: Date#to_s(:ymd) is deprecated. Please use Date#to_fs(:ymd) instead.
2022-11-07 22:05:39 +10:30
Daniel O'Connor
58972e2898
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-07 22:01:28 +10:30
Daniel O'Connor
9eb35cebf4
Update dependabot.yml
2022-11-07 22:00:31 +10:30
Daniel O'Connor
908b4b9279
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-07 21:59:18 +10:30
Daniel O'Connor
98b496311d
Revert "Bump CMS"
...
This reverts commit fe54eee35c .
2022-11-07 21:59:02 +10:30
dependabot[bot]
b2730f5946
Bump geocoder from 1.8.0 to 1.8.1
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.8.0...v1.8.1 )
---
updated-dependencies:
- dependency-name: geocoder
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 11:25:03 +00:00
dependabot[bot]
65dc8eddc1
Bump loofah from 2.18.0 to 2.19.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.18.0 to 2.19.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.18.0...v2.19.0 )
---
updated-dependencies:
- dependency-name: loofah
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 11:25:03 +00:00
dependabot[bot]
0052a374f5
Bump i18n-tasks from 1.0.11 to 1.0.12
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 1.0.11 to 1.0.12.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.11...v1.0.12 )
---
updated-dependencies:
- dependency-name: i18n-tasks
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 11:25:03 +00:00
dependabot[bot]
04f21520a3
Bump oj from 3.13.22 to 3.13.23
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.22 to 3.13.23.
- [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.13.22...v3.13.23 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 11:24:59 +00:00
Daniel O'Connor
7173b775f6
Merge pull request #3152 from Growstuff/dependabot/bundler/scout_apm-5.3.2
...
Bump scout_apm from 5.3.1 to 5.3.2
2022-11-07 21:54:01 +10:30
dependabot[bot]
4d29c1d45f
Bump scout_apm from 5.3.1 to 5.3.2
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 5.3.1 to 5.3.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/v5.3.1...v5.3.2 )
---
updated-dependencies:
- dependency-name: scout_apm
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-07 07:04:52 +00:00
Cesy
f9a704c12a
Merge pull request #3143 from Growstuff/dev
...
Deploy Rails 6.1.7
2022-11-06 08:46:37 +00:00
Daniel O'Connor
fe54eee35c
Bump CMS
2022-11-06 17:47:42 +10:30
Daniel O'Connor
5f556d7b0c
deprecations
2022-11-06 17:44:23 +10:30
Daniel O'Connor
c4e1046f5f
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-06 17:41:58 +10:30
Daniel O'Connor
05a1a23285
Revert "Brakeman"
...
This reverts commit edbd2c45f4 .
2022-11-06 17:36:57 +10:30
Daniel O'Connor
2c5f2a2e8c
Revert "Brakeman"
...
This reverts commit bf500c5a3b .
2022-11-06 17:36:52 +10:30
Daniel O'Connor
cb65c42d08
Revert "Brakeman"
...
This reverts commit df95ba0222 .
2022-11-06 17:36:49 +10:30
Daniel O'Connor
fe3508327d
Revert "Brakeman"
...
This reverts commit da76386bd1 .
2022-11-06 17:36:45 +10:30
Daniel O'Connor
ec955f4f06
Revert "Brakeman complaint"
...
This reverts commit 35b08f88f5 .
2022-11-06 17:36:42 +10:30
Daniel O'Connor
bd62d536a9
Revert "Brakeman complaint"
...
This reverts commit 314c7c1d3b .
2022-11-06 17:36:37 +10:30
Daniel O'Connor
a70b28fbe7
Revert "Brakeman complaint"
...
This reverts commit 93274c33f2 .
2022-11-06 17:36:30 +10:30
Daniel O'Connor
5eb0ac9338
Revert "Fix Brakeman complaint"
...
This reverts commit 35068befe3 .
2022-11-06 17:36:22 +10:30
Daniel O'Connor
1931be88e9
Revert "Fix Brakeman complaint"
...
This reverts commit a62a52540a .
2022-11-06 17:36:18 +10:30
Daniel O'Connor
892cd1c463
Revert "Fix Brakeman complaint"
...
This reverts commit 35f0488a46 .
2022-11-06 17:36:11 +10:30
Daniel O'Connor
678eaa4d52
Revert "Fix Brakeman complaint"
...
This reverts commit c611a47d1f .
2022-11-06 17:36:06 +10:30
Daniel O'Connor
cd8ba1540e
Revert "Fix brakeman complaint"
...
This reverts commit 817f957aac .
2022-11-06 17:35:18 +10:30
Daniel O'Connor
edbd2c45f4
Brakeman
2022-11-06 17:22:09 +10:30
Daniel O'Connor
bf500c5a3b
Brakeman
2022-11-06 17:20:13 +10:30
Daniel O'Connor
df95ba0222
Brakeman
2022-11-06 17:09:22 +10:30
Daniel O'Connor
da76386bd1
Brakeman
2022-11-06 17:08:15 +10:30
Daniel O'Connor
35b08f88f5
Brakeman complaint
2022-11-06 17:07:06 +10:30
dependabot[bot]
9d400805c1
Merge pull request #3138 from Growstuff/dependabot/bundler/sidekiq-7.0.1
2022-11-06 06:35:16 +00:00
dependabot[bot]
94b3929926
Merge pull request #3117 from Growstuff/dependabot/bundler/omniauth-2.1.0
2022-11-06 06:33:59 +00:00
Daniel O'Connor
314c7c1d3b
Brakeman complaint
2022-11-06 17:03:40 +10:30
Daniel O'Connor
93274c33f2
Brakeman complaint
2022-11-06 17:02:33 +10:30
Daniel O'Connor
35068befe3
Fix Brakeman complaint
2022-11-06 16:58:14 +10:30
Daniel O'Connor
a62a52540a
Fix Brakeman complaint
2022-11-06 16:58:14 +10:30
Daniel O'Connor
35f0488a46
Fix Brakeman complaint
2022-11-06 16:58:14 +10:30
Daniel O'Connor
c611a47d1f
Fix Brakeman complaint
2022-11-06 16:58:14 +10:30
Daniel O'Connor
556770d8d2
Update brakeman-analysis.yml
2022-11-06 16:50:33 +10:30
Daniel O'Connor
817f957aac
Fix brakeman complaint
2022-11-06 16:46:53 +10:30
Daniel O'Connor
55ccf8e1af
Bump defaults
2022-11-06 16:44:06 +10:30
Daniel O'Connor
0bd31b0e8d
Merge branch 'dev' into dependabot/bundler/omniauth-2.1.0
2022-11-06 16:41:35 +10:30
dependabot[bot]
853d1dd103
Bump sidekiq from 6.5.5 to 7.0.1
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.5.5 to 7.0.1.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.5.5...v7.0.1 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-06 06:08:48 +00:00
Daniel O'Connor
fcb4069ec7
Regenerate
2022-11-06 16:36:35 +10:30
Daniel O'Connor
39ea0d4882
Rubocop - auto corrections
2022-11-06 16:35:09 +10:30
Daniel O'Connor
b24b9f82e6
Rubocop - auto corrections
2022-11-06 16:34:36 +10:30
Daniel O'Connor
dd54cf2288
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-06 16:32:49 +10:30
Daniel O'Connor
5a61151c4b
Merge pull request #3142 from Growstuff/bump/rubocop
...
Bump rubocop
2022-11-06 16:32:11 +10:30
Daniel O'Connor
ab460f4f39
DEPRECATION WARNING: Date#to_s(:ymd) is deprecated. Please use Date#to_fs(:ymd) instead.
2022-11-06 16:31:13 +10:30
Daniel O'Connor
ef1938879e
DEPRECATION WARNING: TimeWithZone#to_s(:rfc822) is deprecated. Please use TimeWithZone#to_fs(:rfc822) instead.
2022-11-06 16:30:30 +10:30
Daniel O'Connor
ded1e66d53
DEPRECATION WARNING: Time#to_s(:number) is deprecated. Please use Time#to_fs(:number) instead
2022-11-06 16:29:26 +10:30
Daniel O'Connor
c53925b3a4
Merge pull request #3116 from Growstuff/dependabot/bundler/puma-6.0.0
...
Bump puma from 5.6.4 to 6.0.0
2022-11-06 16:24:58 +10:30
Daniel O'Connor
24633df6a9
Remove redundant start
2022-11-06 16:18:00 +10:30
Daniel O'Connor
23829b7d6b
Bump rails further
2022-11-06 16:16:47 +10:30
Daniel O'Connor
ef643cea59
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-06 16:15:52 +10:30
dependabot[bot]
0509523651
Bump puma from 5.6.4 to 6.0.0
...
Bumps [puma](https://github.com/puma/puma ) from 5.6.4 to 6.0.0.
- [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.6.4...v6.0.0 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-06 05:41:18 +00:00
Daniel O'Connor
0b2d308cce
Merge branch 'dev' into dependabot/bundler/omniauth-2.1.0
2022-11-06 16:09:59 +10:30
Daniel O'Connor
73b227fb8e
Merge pull request #3100 from Growstuff/dependabot/bundler/omniauth-1.9.2
...
Bump omniauth from 1.9.1 to 1.9.2
2022-11-06 16:09:35 +10:30
Daniel O'Connor
eca833866b
Merge pull request #3141 from Growstuff/bump/capybara
...
Bump capybara
2022-11-06 16:08:35 +10:30
Daniel O'Connor
0bd136f333
Regenerate rubocop todo
2022-11-06 16:07:58 +10:30
codefactor-io
ff2d96b9bd
[CodeFactor] Apply fixes
2022-11-06 05:37:42 +00:00
Daniel O'Connor
555c1ef145
Clean up Gemfile.lock
2022-11-06 16:04:47 +10:30
Daniel O'Connor
6d296cf336
Merge branch 'dev' into bump-ruby-3.1.x
2022-11-06 16:03:08 +10:30
Daniel O'Connor
7e242e76cb
Merge branch 'dev' into dependabot/bundler/omniauth-1.9.2
2022-11-06 15:45:41 +10:30
dependabot[bot]
9f307f22cf
Bump omniauth from 1.9.1 to 2.1.0
...
Bumps [omniauth](https://github.com/omniauth/omniauth ) from 1.9.1 to 2.1.0.
- [Release notes](https://github.com/omniauth/omniauth/releases )
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.1...v2.1.0 )
---
updated-dependencies:
- dependency-name: omniauth
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-06 05:15:31 +00:00
Daniel O'Connor
5e4887e5af
Bump capybara
2022-11-06 15:41:51 +10:30
Daniel O'Connor
041acd09bb
Merge pull request #3118 from Growstuff/dependabot/bundler/rails-7.0.4
...
Bump rails from 6.1.6.1 to 7.0.4
2022-11-06 15:31:38 +10:30
Daniel O'Connor
623c8e36f1
Merge pull request #3127 from Growstuff/dev
...
Main release
2022-11-06 15:27:09 +10:30
dependabot[bot]
f82405b6bb
Bump rails from 6.1.6.1 to 7.0.4
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.6.1 to 7.0.4.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.6.1...v7.0.4 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-06 03:07:04 +00:00
dependabot[bot]
fb6eae7f95
Merge pull request #3134 from Growstuff/dependabot/bundler/bootstrap-4.6.2
2022-11-06 03:06:05 +00:00
dependabot[bot]
6b8b82dffc
Bump bootstrap from 4.6.1 to 4.6.2
...
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases )
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/main/CHANGELOG.md )
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.6.1...v4.6.2 )
---
updated-dependencies:
- dependency-name: bootstrap
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-06 02:48:01 +00:00
dependabot[bot]
803b732c3e
Merge pull request #3135 from Growstuff/dependabot/bundler/haml-rails-2.1.0
2022-11-06 02:47:09 +00:00
dependabot[bot]
c9e438a229
Bump haml-rails from 2.0.1 to 2.1.0
...
Bumps [haml-rails](https://github.com/haml/haml-rails ) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/haml/haml-rails/releases )
- [Commits](https://github.com/haml/haml-rails/compare/v2.0.1...v2.1.0 )
---
updated-dependencies:
- dependency-name: haml-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-06 02:27:12 +00:00
dependabot[bot]
debca2fc64
Merge pull request #3133 from Growstuff/dependabot/bundler/ruby-units-3.0.0
2022-11-06 02:20:29 +00:00
dependabot[bot]
c7ed10883a
Bump ruby-units from 2.4.1 to 3.0.0
...
Bumps [ruby-units](https://github.com/olbrich/ruby-units ) from 2.4.1 to 3.0.0.
- [Release notes](https://github.com/olbrich/ruby-units/releases )
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt )
- [Commits](https://github.com/olbrich/ruby-units/compare/v2.4.1...v3.0.0 )
---
updated-dependencies:
- dependency-name: ruby-units
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-06 01:52:08 +00:00
Daniel O'Connor
6e21cae538
Pin more spiecifically
2022-11-06 12:01:42 +10:30
Daniel O'Connor
6705cfa044
Pin
2022-11-06 12:00:26 +10:30
Daniel O'Connor
ba81e3dd16
Merge pull request #3139 from Growstuff/bump-bundler
...
Bump bundler.
2022-11-06 11:47:13 +10:30
Daniel O'Connor
8bf1f4203e
Merge branch 'dev' into bump-bundler
2022-11-06 11:46:57 +10:30
Daniel O'Connor
a2b0dcca74
Trigger Heroku deploy
2022-11-06 11:43:45 +10:30
Daniel O'Connor
c87fd9e664
Bump
2022-11-06 11:36:58 +10:30
Daniel O'Connor
d20a63431e
Merge branch 'mainline' into dev
2022-11-06 08:06:30 +10:30
Daniel O'Connor
7cf5cf9651
Merge pull request #3131 from Growstuff/dependabot/bundler/pg-1.4.4
...
Bump pg from 1.4.3 to 1.4.4
2022-11-06 08:00:29 +10:30
dependabot[bot]
03d10016db
Bump pg from 1.4.3 to 1.4.4
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.3...v1.4.4 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-05 20:12:31 +00:00
dependabot[bot]
b8e26a7e2c
Merge pull request #3136 from Growstuff/dependabot/bundler/rspec-rails-6.0.1
2022-11-05 20:11:33 +00:00
dependabot[bot]
4626428282
Bump rspec-rails from 5.1.2 to 6.0.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.1.2 to 6.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.1.2...v6.0.1 )
---
updated-dependencies:
- dependency-name: rspec-rails
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-05 19:52:40 +00:00
Brenda Wallace
e8d80c1bea
Merge pull request #3137 from Growstuff/dependabot/bundler/faker-3.0.0
...
Bump faker from 2.22.0 to 3.0.0
2022-11-06 08:51:51 +13:00
dependabot[bot]
7e24ea5090
Bump faker from 2.22.0 to 3.0.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.22.0 to 3.0.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.22.0...v3.0.0 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-03 07:02:09 +00:00
Cesy
9ef8fc2539
Merge pull request #3125 from Growstuff/dependabot/bundler/oj-3.13.22
...
Bump oj from 3.13.20 to 3.13.22
2022-11-02 16:41:00 +00:00
dependabot[bot]
6797bd5f51
Bump oj from 3.13.20 to 3.13.22
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.20 to 3.13.22.
- [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.13.20...v3.13.22 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-02 16:17:40 +00:00
Cesy
87ef12d325
Merge pull request #3120 from Growstuff/dependabot/bundler/rswag-specs-2.7.0
...
Bump rswag-specs from 2.5.1 to 2.7.0
2022-11-02 16:16:41 +00:00
dependabot[bot]
4a0b758d9a
Bump rswag-specs from 2.5.1 to 2.7.0
...
Bumps [rswag-specs](https://github.com/rswag/rswag ) from 2.5.1 to 2.7.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.5.1...2.7.0 )
---
updated-dependencies:
- dependency-name: rswag-specs
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-02 15:47:08 +00:00
Cesy
16a6b767c9
Merge pull request #3119 from Growstuff/dependabot/bundler/rswag-ui-2.7.0
...
Bump rswag-ui from 2.5.1 to 2.7.0
2022-11-02 15:46:11 +00:00
dependabot[bot]
c7c522d357
Bump rswag-ui from 2.5.1 to 2.7.0
...
Bumps [rswag-ui](https://github.com/rswag/rswag ) from 2.5.1 to 2.7.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.5.1...2.7.0 )
---
updated-dependencies:
- dependency-name: rswag-ui
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-02 15:15:34 +00:00
Cesy
7bcaff258b
Merge pull request #3115 from Growstuff/dependabot/bundler/haml_lint-0.42.0
...
Bump haml_lint from 0.40.0 to 0.42.0
2022-11-02 15:14:45 +00:00
dependabot[bot]
3f314cb1c3
Bump haml_lint from 0.40.0 to 0.42.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.40.0 to 0.42.0.
- [Release notes](https://github.com/sds/haml-lint/releases )
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sds/haml-lint/compare/v0.40.0...v0.42.0 )
---
updated-dependencies:
- dependency-name: haml_lint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-02 13:08:03 +00:00
Cesy
8935d45479
Merge pull request #3113 from Growstuff/dependabot/bundler/platform-api-3.5.0
...
Bump platform-api from 3.3.0 to 3.5.0
2022-11-02 13:07:04 +00:00
dependabot[bot]
8a44f9b0e7
Bump platform-api from 3.3.0 to 3.5.0
...
Bumps [platform-api](https://github.com/heroku/platform-api ) from 3.3.0 to 3.5.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.3.0...v3.5.0 )
---
updated-dependencies:
- dependency-name: platform-api
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-02 12:24:42 +00:00
Cesy
ac5fa0553d
Merge pull request #3107 from Growstuff/dependabot/bundler/faraday-1.10.2
...
Bump faraday from 1.10.1 to 1.10.2
2022-11-02 12:23:40 +00:00
dependabot[bot]
7a441b8d96
Bump faraday from 1.10.1 to 1.10.2
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v1.10.1...v1.10.2 )
---
updated-dependencies:
- dependency-name: faraday
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-11-02 11:45:24 +00:00
Cesy
b3b6ce60a0
Merge pull request #3091 from Growstuff/dependabot/bundler/chartkick-4.2.1
...
Bump chartkick from 4.1.3 to 4.2.1
2022-11-02 11:44:22 +00:00
dependabot[bot]
3828733cbe
Bump chartkick from 4.1.3 to 4.2.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 4.1.3 to 4.2.1.
- [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/v4.1.3...v4.2.1 )
---
updated-dependencies:
- dependency-name: chartkick
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-09-12 04:12:29 +00:00
dependabot[bot]
2817e1e35f
Bump omniauth from 1.9.1 to 1.9.2
...
Bumps [omniauth](https://github.com/omniauth/omniauth ) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/omniauth/omniauth/releases )
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.1...v1.9.2 )
---
updated-dependencies:
- dependency-name: omniauth
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-09-12 04:12:11 +00:00
dependabot[bot]
4c8f3b830e
Merge pull request #3058 from Growstuff/dependabot/bundler/jquery-rails-4.5.0
2022-09-12 04:11:02 +00:00
dependabot[bot]
c48fee18dd
Bump jquery-rails from 4.4.0 to 4.5.0
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v4.4.0...v4.5.0 )
---
updated-dependencies:
- dependency-name: jquery-rails
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-09-12 03:51:57 +00:00
dependabot[bot]
f16202636a
Merge pull request #3108 from Growstuff/dependabot/bundler/leaflet-rails-1.8.0
2022-09-12 03:50:56 +00:00
dependabot[bot]
fe132b342c
Bump leaflet-rails from 1.7.0 to 1.8.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.7.0...v1.8.0 )
---
updated-dependencies:
- dependency-name: leaflet-rails
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-09-12 03:31:26 +00:00
dependabot[bot]
7e329aab1f
Merge pull request #3109 from Growstuff/dependabot/bundler/ruby-units-2.4.1
2022-09-12 03:29:50 +00:00
dependabot[bot]
2bcab2e6a5
Bump ruby-units from 2.3.2 to 2.4.1
...
Bumps [ruby-units](https://github.com/olbrich/ruby-units ) from 2.3.2 to 2.4.1.
- [Release notes](https://github.com/olbrich/ruby-units/releases )
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt )
- [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.2...v2.4.1 )
---
updated-dependencies:
- dependency-name: ruby-units
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-09-12 03:07:25 +00:00
Brenda Wallace
78676b7507
Merge pull request #3101 from Growstuff/dependabot/bundler/scout_apm-5.3.1
...
Bump scout_apm from 5.2.0 to 5.3.1
2022-09-12 15:06:08 +12:00
dependabot[bot]
015b8223fd
Bump scout_apm from 5.2.0 to 5.3.1
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 5.2.0 to 5.3.1.
- [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/v5.2.0...v5.3.1 )
---
updated-dependencies:
- dependency-name: scout_apm
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-23 12:11:51 +00:00
Brenda Wallace
64de00d063
Merge pull request #3106 from Growstuff/dependabot/bundler/sidekiq-6.5.5
...
Bump sidekiq from 6.5.4 to 6.5.5
2022-08-24 00:10:42 +12:00
dependabot[bot]
605f70dbdb
Bump sidekiq from 6.5.4 to 6.5.5
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.5.4 to 6.5.5.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.5.4...v6.5.5 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-23 07:01:52 +00:00
dependabot[bot]
5e438be00d
Merge pull request #3098 from Growstuff/dependabot/bundler/bullet-7.0.3
2022-08-15 12:14:43 +00:00
dependabot[bot]
4c1630d845
Bump bullet from 7.0.2 to 7.0.3
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.2...7.0.3 )
---
updated-dependencies:
- dependency-name: bullet
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-15 07:01:29 +00:00
dependabot[bot]
8f34766d09
Merge pull request #3096 from Growstuff/dependabot/bundler/pg-1.4.3
2022-08-14 12:11:47 +00:00
dependabot[bot]
5841f0df04
Bump pg from 1.4.2 to 1.4.3
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.2...v1.4.3 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-14 11:53:05 +00:00
Daniel O'Connor
552f7cf9d8
Merge pull request #3097 from Growstuff/dependabot/bundler/selenium-webdriver-4.4.0
...
Bump selenium-webdriver from 4.3.0 to 4.4.0
2022-08-14 21:22:08 +09:30
dependabot[bot]
28ab318b7b
Bump selenium-webdriver from 4.3.0 to 4.4.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.3.0...selenium-4.4.0 )
---
updated-dependencies:
- dependency-name: selenium-webdriver
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-10 07:02:16 +00:00
dependabot[bot]
41e4bdb79c
Merge pull request #3094 from Growstuff/dependabot/bundler/sidekiq-6.5.4
2022-08-09 10:09:15 +00:00
dependabot[bot]
ab900fc1db
Bump sidekiq from 6.5.3 to 6.5.4
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.5.3...v6.5.4 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-09 09:50:52 +00:00
dependabot[bot]
e70f056c6e
Merge pull request #3093 from Growstuff/dependabot/bundler/oj-3.13.20
2022-08-09 09:49:43 +00:00
dependabot[bot]
c4d84b2b00
Bump oj from 3.13.19 to 3.13.20
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.19 to 3.13.20.
- [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.13.19...v3.13.20 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-09 09:32:01 +00:00
dependabot[bot]
78015b088f
Merge pull request #3095 from Growstuff/dependabot/bundler/faraday-1.10.1
2022-08-09 09:30:12 +00:00
dependabot[bot]
96a2df5e0f
Bump faraday from 1.10.0 to 1.10.1
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v1.10.0...v1.10.1 )
---
updated-dependencies:
- dependency-name: faraday
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-09 07:02:17 +00:00
dependabot[bot]
55a3722ed3
Merge pull request #3092 from Growstuff/dependabot/bundler/sidekiq-6.5.3
2022-08-07 09:14:37 +00:00
dependabot[bot]
003519a458
Bump sidekiq from 6.5.1 to 6.5.3
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.5.1 to 6.5.3.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.5.1...v6.5.3 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-05 07:00:57 +00:00
Daniel O'Connor
b086f15aac
Merge pull request #3090 from Growstuff/dependabot/bundler/oj-3.13.19
...
Bump oj from 3.13.18 to 3.13.19
2022-08-01 21:49:25 +09:30
dependabot[bot]
ee93c79776
Bump oj from 3.13.18 to 3.13.19
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.18 to 3.13.19.
- [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.13.18...v3.13.19 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-08-01 07:01:44 +00:00
dependabot[bot]
f55e38e632
Merge pull request #3087 from Growstuff/dependabot/bundler/dotenv-rails-2.8.1
2022-07-30 13:26:04 +00:00
dependabot[bot]
216a38bfa9
Bump dotenv-rails from 2.7.6 to 2.8.1
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.7.6 to 2.8.1.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.6...v2.8.1 )
---
updated-dependencies:
- dependency-name: dotenv-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-30 13:07:17 +00:00
dependabot[bot]
b9ea3db18c
Merge pull request #3088 from Growstuff/dependabot/bundler/pg-1.4.2
2022-07-30 13:06:04 +00:00
dependabot[bot]
94bcacf066
Bump pg from 1.3.4 to 1.4.2
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.3.4 to 1.4.2.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.4...v1.4.2 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-30 12:44:52 +00:00
dependabot[bot]
89faad7a7a
Merge pull request #3089 from Growstuff/dependabot/bundler/faker-2.22.0
2022-07-30 12:43:59 +00:00
dependabot[bot]
32a66c8d13
Bump faker from 2.21.0 to 2.22.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.21.0 to 2.22.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.21.0...v2.22.0 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-29 07:01:42 +00:00
dependabot[bot]
e28aa38f0d
Merge pull request #3084 from Growstuff/dependabot/bundler/rack-protection-2.2.2
2022-07-26 14:11:36 +00:00
dependabot[bot]
8a874270f8
Bump rack-protection from 2.2.1 to 2.2.2
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.2.1...v2.2.2 )
---
updated-dependencies:
- dependency-name: rack-protection
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-26 13:50:55 +00:00
dependabot[bot]
18d1770955
Merge pull request #3085 from Growstuff/dependabot/bundler/oj-3.13.18
2022-07-26 13:49:50 +00:00
dependabot[bot]
0f3573e26f
Bump oj from 3.13.17 to 3.13.18
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.17 to 3.13.18.
- [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.13.17...v3.13.18 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-26 07:01:22 +00:00
dependabot[bot]
1620a67116
Merge pull request #3082 from Growstuff/dependabot/bundler/rack-protection-2.2.1
2022-07-18 08:33:44 +00:00
dependabot[bot]
19ff4718f9
Bump rack-protection from 2.2.0 to 2.2.1
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/v2.2.1/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.2.0...v2.2.1 )
---
updated-dependencies:
- dependency-name: rack-protection
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-18 08:16:52 +00:00
dependabot[bot]
b7fa7dcc24
Merge pull request #3083 from Growstuff/dependabot/bundler/oj-3.13.17
2022-07-18 08:15:53 +00:00
dependabot[bot]
4cbf6c1fcc
Bump oj from 3.13.16 to 3.13.17
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.16 to 3.13.17.
- [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.13.16...v3.13.17 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-18 07:01:49 +00:00
dependabot[bot]
ed142b9cd9
Merge pull request #3080 from Growstuff/dependabot/bundler/rails-6.1.6.1
2022-07-14 14:55:52 +00:00
dependabot[bot]
25fc6400b9
Bump rails from 6.1.6 to 6.1.6.1
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.6 to 6.1.6.1.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.6...v6.1.6.1 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-13 07:01:54 +00:00
dependabot[bot]
2d759ee512
Merge pull request #3073 from Growstuff/dependabot/bundler/selenium-webdriver-4.3.0
2022-07-08 15:16:47 +00:00
dependabot[bot]
7cfe59fe22
Bump selenium-webdriver from 4.2.1 to 4.3.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 4.2.1 to 4.3.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.3.0 )
---
updated-dependencies:
- dependency-name: selenium-webdriver
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-08 14:59:09 +00:00
dependabot[bot]
0e6ff84206
Merge pull request #3070 from Growstuff/dependabot/bundler/dalli-3.2.2
2022-07-08 14:58:02 +00:00
dependabot[bot]
d2207f2a8a
Bump dalli from 3.2.1 to 3.2.2
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/main/History.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v3.2.1...v3.2.2 )
---
updated-dependencies:
- dependency-name: dalli
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-08 14:41:44 +00:00
dependabot[bot]
83f09bbf1c
Merge pull request #3074 from Growstuff/dependabot/bundler/cancancan-3.4.0
2022-07-08 14:40:30 +00:00
dependabot[bot]
f61d90fa9a
Bump cancancan from 3.3.0 to 3.4.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.3.0...3.4.0 )
---
updated-dependencies:
- dependency-name: cancancan
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-08 14:23:22 +00:00
dependabot[bot]
7460720e9a
Merge pull request #3068 from Growstuff/dependabot/bundler/i18n-tasks-1.0.11
2022-07-08 14:22:05 +00:00
dependabot[bot]
3f9c3a4638
Bump i18n-tasks from 1.0.10 to 1.0.11
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 1.0.10 to 1.0.11.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.10...v1.0.11 )
---
updated-dependencies:
- dependency-name: i18n-tasks
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-08 14:04:31 +00:00
dependabot[bot]
d2928484ec
Merge pull request #3072 from Growstuff/dependabot/bundler/scout_apm-5.2.0
2022-07-08 14:03:25 +00:00
dependabot[bot]
124aa4b286
Bump scout_apm from 5.1.1 to 5.2.0
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 5.1.1 to 5.2.0.
- [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/v5.1.1...v5.2.0 )
---
updated-dependencies:
- dependency-name: scout_apm
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-08 13:45:48 +00:00
dependabot[bot]
835c9eba37
Merge pull request #3069 from Growstuff/dependabot/bundler/sidekiq-6.5.1
2022-07-08 13:44:29 +00:00
dependabot[bot]
fb6438f9ec
Bump sidekiq from 6.4.2 to 6.5.1
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.4.2 to 6.5.1.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.4.2...v6.5.1 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-08 13:26:09 +00:00
dependabot[bot]
060a415757
Merge pull request #3079 from Growstuff/dependabot/bundler/oj-3.13.16
2022-07-08 13:25:04 +00:00
dependabot[bot]
a630afc768
Bump oj from 3.13.13 to 3.13.16
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.13 to 3.13.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.13.13...v3.13.16 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-07 07:01:53 +00:00
dependabot[bot]
3c3ae0a887
Merge pull request #3055 from Growstuff/dependabot/bundler/geocoder-1.8.0
2022-06-01 13:29:03 +00:00
dependabot[bot]
f1b37303e1
Bump geocoder from 1.7.5 to 1.8.0
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.7.5 to 1.8.0.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.7.5...v1.8.0 )
---
updated-dependencies:
- dependency-name: geocoder
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 13:11:57 +00:00
dependabot[bot]
a98bfefddf
Merge pull request #3056 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-456fb85
2022-06-01 13:09:50 +00:00
dependabot[bot]
fdc3c85527
Bump comfortable_mexican_sofa from 2b80ce7 to 456fb85
...
Bumps [comfortable_mexican_sofa](https://github.com/restarone/comfortable-mexican-sofa ) from `2b80ce7` to `456fb85`.
- [Release notes](https://github.com/restarone/comfortable-mexican-sofa/releases )
- [Commits](2b80ce723c...456fb8507e )
---
updated-dependencies:
- dependency-name: comfortable_mexican_sofa
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 12:52:08 +00:00
dependabot[bot]
bc8d6ce4cb
Merge pull request #3053 from Growstuff/dependabot/bundler/validate_url-1.0.15
2022-06-01 12:49:48 +00:00
dependabot[bot]
2761e75f40
Bump validate_url from 1.0.13 to 1.0.15
...
Bumps [validate_url](https://github.com/perfectline/validates_url ) from 1.0.13 to 1.0.15.
- [Release notes](https://github.com/perfectline/validates_url/releases )
- [Commits](https://github.com/perfectline/validates_url/commits )
---
updated-dependencies:
- dependency-name: validate_url
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 12:30:42 +00:00
dependabot[bot]
764449f8bb
Merge pull request #3063 from Growstuff/dependabot/bundler/selenium-webdriver-4.2.1
2022-06-01 12:28:43 +00:00
dependabot[bot]
852a14d88f
Bump selenium-webdriver from 4.1.0 to 4.2.1
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 4.1.0 to 4.2.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
---
updated-dependencies:
- dependency-name: selenium-webdriver
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 12:11:01 +00:00
dependabot[bot]
21b6abad59
Merge pull request #3064 from Growstuff/dependabot/bundler/bullet-7.0.2
2022-06-01 12:09:43 +00:00
dependabot[bot]
a0b5a9597c
Bump bullet from 7.0.1 to 7.0.2
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.1...7.0.2 )
---
updated-dependencies:
- dependency-name: bullet
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 09:09:18 +00:00
dependabot[bot]
71a988f6a7
Merge pull request #3062 from Growstuff/dependabot/bundler/rack-2.2.3.1
2022-05-31 23:26:45 +00:00
dependabot[bot]
2c2644fb9d
Bump rack from 2.2.3 to 2.2.3.1
...
Bumps [rack](https://github.com/rack/rack ) from 2.2.3 to 2.2.3.1.
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.2.3...2.2.3.1 )
---
updated-dependencies:
- dependency-name: rack
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-31 23:08:19 +00:00
dependabot[bot]
bb7e330975
Merge pull request #3054 from Growstuff/dependabot/bundler/faker-2.21.0
2022-05-31 23:06:57 +00:00
dependabot[bot]
11c3e617ca
Bump faker from 2.20.0 to 2.21.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.20.0 to 2.21.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.20.0...v2.21.0 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-31 22:48:18 +00:00
dependabot[bot]
084cf8ac9c
Merge pull request #3052 from Growstuff/dependabot/bundler/loofah-2.18.0
2022-05-31 22:47:11 +00:00
dependabot[bot]
e0683d122f
Bump loofah from 2.17.0 to 2.18.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.17.0 to 2.18.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.17.0...v2.18.0 )
---
updated-dependencies:
- dependency-name: loofah
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-31 22:27:44 +00:00
dependabot[bot]
09836f314b
Merge pull request #3057 from Growstuff/dependabot/bundler/oj-3.13.13
2022-05-31 22:26:40 +00:00
dependabot[bot]
99f72cbdf9
Bump oj from 3.13.11 to 3.13.13
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.11 to 3.13.13.
- [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.13.11...v3.13.13 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-23 07:02:54 +00:00
dependabot[bot]
541351cd42
Merge pull request #3048 from Growstuff/dependabot/bundler/i18n-tasks-1.0.10
2022-05-10 22:35:28 +00:00
dependabot[bot]
c9574cfb8b
Bump i18n-tasks from 1.0.9 to 1.0.10
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 1.0.9 to 1.0.10.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.9...v1.0.10 )
---
updated-dependencies:
- dependency-name: i18n-tasks
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-10 22:13:59 +00:00
dependabot[bot]
a0e8b6701f
Merge pull request #3050 from Growstuff/dependabot/bundler/capybara-3.37.1
2022-05-10 22:12:56 +00:00
dependabot[bot]
5ae1e8fa02
Bump capybara from 3.36.0 to 3.37.1
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.36.0 to 3.37.1.
- [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.36.0...3.37.1 )
---
updated-dependencies:
- dependency-name: capybara
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-10 21:54:44 +00:00
Brenda Wallace
2b48c18ff6
Merge pull request #3051 from Growstuff/dependabot/bundler/rails-6.1.6
...
Bump rails from 6.1.5.1 to 6.1.6
2022-05-11 09:50:59 +12:00
dependabot[bot]
cf57bbcbe6
Bump rails from 6.1.5.1 to 6.1.6
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.5.1 to 6.1.6.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.5.1...v6.1.6 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-10 07:01:48 +00:00
Daniel O'Connor
2fca24bce4
Merge pull request #3046 from Growstuff/bump-bootstrap
...
Bump min deps
2022-05-01 17:39:25 +09:30
Daniel O'Connor
aa6ea3f6b6
Merge pull request #3040 from Growstuff/dev
...
Release 2022-04-30
2022-05-01 17:37:37 +09:30
Daniel O'Connor
45bd8ba9a3
Pin explicitly
2022-05-01 17:16:20 +09:30
Daniel O'Connor
b0d7aee680
Pin higher, synk
2022-05-01 17:15:00 +09:30
Daniel O'Connor
89bb30011c
Fixes #3402 ( #3043 )
2022-05-01 17:10:05 +09:30
Daniel O'Connor
260f19e047
Add tests #3401 - wrong resources loaded ( #3045 )
...
* Prove broken
* Allow filter by owner id
* Specify FK
* Mark pending, and cover filter by member
2022-05-01 17:09:13 +09:30
Daniel O'Connor
5de1186b13
Update brakeman-analysis.yml
...
Only run on PR
2022-05-01 11:55:00 +09:30
dependabot[bot]
9c6e3412c7
Merge pull request #3036 from Growstuff/dependabot/github_actions/github/codeql-action-2
2022-04-30 07:45:05 +00:00
dependabot[bot]
90ec149da4
Bump github/codeql-action from 1 to 2
...
Bumps [github/codeql-action](https://github.com/github/codeql-action ) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases )
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md )
- [Commits](https://github.com/github/codeql-action/compare/v1...v2 )
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-30 07:12:10 +00:00
dependabot[bot]
a2174ccfd0
Merge pull request #3039 from Growstuff/dependabot/bundler/loofah-2.17.0
2022-04-30 07:11:00 +00:00
dependabot[bot]
3e68d2d00f
Bump loofah from 2.16.0 to 2.17.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.16.0 to 2.17.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.16.0...v2.17.0 )
---
updated-dependencies:
- dependency-name: loofah
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-30 06:53:51 +00:00
dependabot[bot]
b9bde2b9d9
Merge pull request #3034 from Growstuff/dependabot/bundler/rspec-rails-5.1.2
2022-04-30 06:52:43 +00:00
dependabot[bot]
47056c3f96
Bump rspec-rails from 5.1.1 to 5.1.2
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.1.1...v5.1.2 )
---
updated-dependencies:
- dependency-name: rspec-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-30 06:35:46 +00:00
dependabot[bot]
755b3df964
Merge pull request #3033 from Growstuff/dependabot/bundler/sidekiq-6.4.2
2022-04-30 06:34:43 +00:00
dependabot[bot]
1102600a13
Bump sidekiq from 6.4.1 to 6.4.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.4.1 to 6.4.2.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.4.1...v6.4.2 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-30 06:13:37 +00:00
dependabot[bot]
7191b170c4
Merge pull request #3037 from Growstuff/dependabot/bundler/rails-6.1.5.1
2022-04-30 06:12:27 +00:00
dependabot[bot]
010406bab4
Bump rails from 6.1.5 to 6.1.5.1
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.5 to 6.1.5.1.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.5...v6.1.5.1 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-27 07:01:56 +00:00
Daniel O'Connor
bf8504009c
Bump to Ruby 3 ( #2978 )
...
* Ruby 2.7.5
* Bump to Ruby 3
* Ruby 2.7.5
* Swap to a ruby3 friendly branch
* Ruby
* Bump
* Remove third argument for text columns
* Rubocop
* Splat args
* Rubocop complaints
* Lint
2022-04-19 22:36:12 +09:30
Daniel O'Connor
4b87899121
Fight editorconfig, because reasons
2022-04-17 00:57:47 +09:30
Daniel O'Connor
42fe9ede15
Bump rails
2022-04-17 00:57:33 +09:30
Daniel O'Connor
3c3639fc07
Fight editorconfig, because reasons
2022-04-17 00:55:40 +09:30
Daniel O'Connor
e8318a1961
Update .rubocop.yml
2022-04-17 00:46:41 +09:30
Daniel O'Connor
bc4227a4a3
Update .rubocop.yml
2022-04-17 00:44:13 +09:30
Daniel O'Connor
3a5b06d810
Ruby 3.1.2
2022-04-17 00:39:16 +09:30
Daniel O'Connor
721f197cae
Lint
2022-04-17 00:28:55 +09:30
Daniel O'Connor
6cc711646e
Rubocop complaints
2022-04-17 00:27:23 +09:30
Daniel O'Connor
ad6487c7a6
Splat args
2022-04-17 00:23:06 +09:30
Daniel O'Connor
82d68784a7
Rubocop
2022-04-16 23:01:43 +09:30
Daniel O'Connor
c816415ae2
Remove third argument for text columns
2022-04-16 22:59:32 +09:30
Daniel O'Connor
4face6b5e2
Merge branch 'dev' into bump-ruby-3.0
2022-04-16 22:38:16 +09:30
Daniel O'Connor
fbeede4755
Merge pull request #3029 from Growstuff/upgrade-cms
...
Swap CMS
2022-04-16 22:35:43 +09:30
Daniel O'Connor
22e2ccc682
Swap CMS
2022-04-16 22:04:25 +09:30
Daniel O'Connor
37a0fac837
Merge branch 'bump-ruby-3.0' of github.com:Growstuff/growstuff into bump-ruby-3.0
2022-04-16 22:00:49 +09:30
Daniel O'Connor
497e24adc1
Bump
2022-04-16 21:59:18 +09:30
Daniel O'Connor
583e3dc077
Ruby
2022-04-16 21:52:37 +09:30
Daniel O'Connor
49ab7468a7
Merge branch 'dev' into bump-ruby-3.0
2022-04-16 21:48:18 +09:30
Daniel O'Connor
ef2b35ab98
Swap to a ruby3 friendly branch
2022-04-16 21:45:38 +09:30
Daniel O'Connor
c70b441372
Merge pull request #3028 from Growstuff/dev
...
Production Deploy 2022-04-12
2022-04-15 13:30:29 +09:30
dependabot[bot]
6ba6b2ee76
Merge pull request #3026 from Growstuff/dependabot/bundler/i18n-tasks-1.0.9
2022-04-12 13:56:12 +00:00
dependabot[bot]
4ad7f0f935
Bump i18n-tasks from 1.0.8 to 1.0.9
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.8...v1.0.9 )
---
updated-dependencies:
- dependency-name: i18n-tasks
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-12 13:34:46 +00:00
Daniel O'Connor
66a818a4aa
Merge pull request #3027 from Growstuff/dependabot/bundler/nokogiri-1.13.4
...
Bump nokogiri from 1.13.3 to 1.13.4
2022-04-12 23:03:26 +09:30
dependabot[bot]
c5ac87c6fa
Bump nokogiri from 1.13.3 to 1.13.4
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-12 10:29:00 +00:00
Daniel O'Connor
c8c52fcd2d
Merge pull request #3025 from Growstuff/dev
...
Production release - minor dependency bumps for 2022-04
2022-04-10 17:19:48 +09:30
dependabot[bot]
269f9fbeab
Merge pull request #3022 from Growstuff/dependabot/bundler/loofah-2.16.0
2022-04-10 04:20:01 +00:00
dependabot[bot]
e8e55054ec
Bump loofah from 2.15.0 to 2.16.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.15.0 to 2.16.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.15.0...v2.16.0 )
---
updated-dependencies:
- dependency-name: loofah
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-10 03:58:54 +00:00
dependabot[bot]
76f87655cb
Merge pull request #3024 from Growstuff/dependabot/bundler/i18n-tasks-1.0.8
2022-04-10 03:58:00 +00:00
dependabot[bot]
ce71406eba
Bump i18n-tasks from 1.0.5 to 1.0.8
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 1.0.5 to 1.0.8.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.5...v1.0.8 )
---
updated-dependencies:
- dependency-name: i18n-tasks
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-07 07:02:17 +00:00
dependabot[bot]
fa558c8afe
Merge pull request #3019 from Growstuff/dependabot/bundler/bootstrap-4.6.1
2022-03-31 09:39:34 +00:00
dependabot[bot]
e0c64e961f
Bump bootstrap from 4.6.0 to 4.6.1
...
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.6.0 to 4.6.1.
- [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.6.0...v4.6.1 )
---
updated-dependencies:
- dependency-name: bootstrap
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-31 09:23:43 +00:00
dependabot[bot]
0b2faec550
Merge pull request #3020 from Growstuff/dependabot/bundler/searchkick-4.6.3
2022-03-31 09:22:28 +00:00
dependabot[bot]
073520b16a
Bump searchkick from 4.6.1 to 4.6.3
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.6.1 to 4.6.3.
- [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.6.1...v4.6.3 )
---
updated-dependencies:
- dependency-name: searchkick
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-31 09:04:44 +00:00
Daniel O'Connor
b2e41d0b79
Merge pull request #3021 from Growstuff/dependabot/bundler/puma-5.6.4
...
Bump puma from 5.6.2 to 5.6.4
2022-03-31 19:33:21 +10:30
dependabot[bot]
89d96c3d1f
Bump puma from 5.6.2 to 5.6.4
...
Bumps [puma](https://github.com/puma/puma ) from 5.6.2 to 5.6.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.6.2...v5.6.4 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-30 22:27:15 +00:00
Daniel O'Connor
4222f06cfe
Merge pull request #2988 from Growstuff/dev
...
Production deploy (security fixes, minor upgrades, rails 6.1)
2022-03-30 08:07:12 +10:30
dependabot[bot]
11ec1c10f9
Bump webdrivers from 4.7.0 to 5.0.0 ( #3018 )
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases )
- [Changelog](https://github.com/titusfortner/webdrivers/blob/main/CHANGELOG.md )
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.7.0...v5.0.0 )
---
updated-dependencies:
- dependency-name: webdrivers
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-30 01:28:31 +10:30
Daniel O'Connor
07d40a20dd
Rails 6.1 Fix warning ( #2983 )
...
* Rails 6.1
* Bump rails
* Fix warning
* Fix tests
2022-03-30 01:23:11 +10:30
Daniel O'Connor
99b11c3eb6
Merge pull request #3014 from Growstuff/dependabot/bundler/omniauth-facebook-9.0.0
...
Bump omniauth-facebook from 8.0.0 to 9.0.0
2022-03-29 23:57:07 +10:30
Daniel O'Connor
2f2e3597bd
Merge pull request #3005 from Growstuff/dependabot/bundler/hashie-5.0.0
...
Bump hashie from 4.1.0 to 5.0.0
2022-03-29 23:56:46 +10:30
Daniel O'Connor
e9ff2fafe4
Merge pull request #3012 from Growstuff/dependabot/bundler/timecop-0.9.5
...
Bump timecop from 0.9.4 to 0.9.5
2022-03-29 23:56:13 +10:30
Daniel O'Connor
50acbb4173
Merge pull request #3015 from Growstuff/dependabot/bundler/devise-4.8.1
...
Bump devise from 4.8.0 to 4.8.1
2022-03-29 23:55:55 +10:30
Daniel O'Connor
2a951ab551
Merge pull request #3016 from Growstuff/dependabot/bundler/rswag-ui-2.5.1
...
Bump rswag-ui from 2.4.0 to 2.5.1
2022-03-29 23:55:29 +10:30
dependabot[bot]
ab553d0dd4
Bump omniauth-facebook from 8.0.0 to 9.0.0
...
Bumps [omniauth-facebook](https://github.com/simi/omniauth-facebook ) from 8.0.0 to 9.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/v8.0.0...v9.0.0 )
---
updated-dependencies:
- dependency-name: omniauth-facebook
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 12:08:50 +00:00
dependabot[bot]
2014adab21
Bump rswag-ui from 2.4.0 to 2.5.1
...
Bumps [rswag-ui](https://github.com/rswag/rswag ) from 2.4.0 to 2.5.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.4.0...2.5.1 )
---
updated-dependencies:
- dependency-name: rswag-ui
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 12:08:36 +00:00
dependabot[bot]
99a6066e88
Bump devise from 4.8.0 to 4.8.1
...
Bumps [devise](https://github.com/heartcombo/devise ) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/heartcombo/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md )
- [Commits](https://github.com/heartcombo/devise/compare/v4.8.0...v4.8.1 )
---
updated-dependencies:
- dependency-name: devise
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 12:08:18 +00:00
dependabot[bot]
0b286434cf
Bump timecop from 0.9.4 to 0.9.5
...
Bumps [timecop](https://github.com/travisjeffery/timecop ) from 0.9.4 to 0.9.5.
- [Release notes](https://github.com/travisjeffery/timecop/releases )
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md )
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.4...v0.9.5 )
---
updated-dependencies:
- dependency-name: timecop
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 12:05:07 +00:00
dependabot[bot]
4e868c32ea
Bump hashie from 4.1.0 to 5.0.0
...
Bumps [hashie](https://github.com/hashie/hashie ) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/hashie/hashie/releases )
- [Changelog](https://github.com/hashie/hashie/blob/master/CHANGELOG.md )
- [Commits](https://github.com/hashie/hashie/compare/v4.1.0...v5.0.0 )
---
updated-dependencies:
- dependency-name: hashie
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 12:05:06 +00:00
Daniel O'Connor
e52e70e4d1
Merge pull request #3006 from Growstuff/dependabot/bundler/selenium-webdriver-4.1.0
...
Bump selenium-webdriver from 3.142.7 to 4.1.0
2022-03-29 22:34:06 +10:30
Daniel O'Connor
32a1029c33
Merge pull request #3007 from Growstuff/dependabot/bundler/haml_lint-0.40.0
...
Bump haml_lint from 0.37.1 to 0.40.0
2022-03-29 22:33:37 +10:30
dependabot[bot]
b90aabbdda
Bump selenium-webdriver from 3.142.7 to 4.1.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.7 to 4.1.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.1.0 )
---
updated-dependencies:
- dependency-name: selenium-webdriver
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 12:03:21 +00:00
dependabot[bot]
095a3bf9df
Bump haml_lint from 0.37.1 to 0.40.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.37.1 to 0.40.0.
- [Release notes](https://github.com/sds/haml-lint/releases )
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sds/haml-lint/compare/v0.37.1...v0.40.0 )
---
updated-dependencies:
- dependency-name: haml_lint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 12:03:21 +00:00
Daniel O'Connor
b38901983b
Merge pull request #3011 from Growstuff/dependabot/bundler/jsonapi-resources-0.10.7
...
Bump jsonapi-resources from 0.10.5 to 0.10.7
2022-03-29 22:32:17 +10:30
Daniel O'Connor
3166b6bc80
Merge pull request #3010 from Growstuff/dependabot/bundler/faker-2.20.0
...
Bump faker from 2.19.0 to 2.20.0
2022-03-29 22:32:06 +10:30
Daniel O'Connor
b70bacb27f
Merge pull request #3009 from Growstuff/dependabot/bundler/rswag-specs-2.5.1
...
Bump rswag-specs from 2.4.0 to 2.5.1
2022-03-29 22:31:54 +10:30
dependabot[bot]
c5a4c34ca0
Bump jsonapi-resources from 0.10.5 to 0.10.7
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.10.5 to 0.10.7.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.10.5...v0.10.7 )
---
updated-dependencies:
- dependency-name: jsonapi-resources
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 11:19:52 +00:00
dependabot[bot]
96a93644cb
Bump faker from 2.19.0 to 2.20.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.19.0 to 2.20.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.19.0...v2.20.0 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 11:19:17 +00:00
dependabot[bot]
f76090e19d
Bump rswag-specs from 2.4.0 to 2.5.1
...
Bumps [rswag-specs](https://github.com/rswag/rswag ) from 2.4.0 to 2.5.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.4.0...2.5.1 )
---
updated-dependencies:
- dependency-name: rswag-specs
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 11:18:53 +00:00
Daniel O'Connor
3e7dc6a577
Merge pull request #2990 from Growstuff/dependabot/bundler/rspectre-0.0.4
...
Bump rspectre from 0.0.3 to 0.0.4
2022-03-29 21:46:41 +10:30
Daniel O'Connor
cc43d547a5
Merge pull request #2991 from Growstuff/dependabot/bundler/listen-3.7.1
...
Bump listen from 3.7.0 to 3.7.1
2022-03-29 21:46:31 +10:30
Daniel O'Connor
426667cf82
Merge pull request #3001 from Growstuff/dependabot/bundler/active_utils-3.3.19
...
Bump active_utils from 3.3.18 to 3.3.19
2022-03-29 21:46:16 +10:30
Daniel O'Connor
98ccd64946
Merge pull request #3003 from Growstuff/dependabot/bundler/scout_apm-5.1.1
...
Bump scout_apm from 4.1.2 to 5.1.1
2022-03-29 21:45:56 +10:30
dependabot[bot]
61f6ff7345
Bump scout_apm from 4.1.2 to 5.1.1
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 4.1.2 to 5.1.1.
- [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/v4.1.2...v5.1.1 )
---
updated-dependencies:
- dependency-name: scout_apm
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 10:09:50 +00:00
dependabot[bot]
0ce29f935b
Bump active_utils from 3.3.18 to 3.3.19
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.18 to 3.3.19.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.18...v3.3.19 )
---
updated-dependencies:
- dependency-name: active_utils
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 10:09:49 +00:00
dependabot[bot]
d57971127d
Bump listen from 3.7.0 to 3.7.1
...
Bumps [listen](https://github.com/guard/listen ) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.7.0...v3.7.1 )
---
updated-dependencies:
- dependency-name: listen
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 10:09:48 +00:00
dependabot[bot]
ed4b3809c7
Bump rspectre from 0.0.3 to 0.0.4
...
Bumps [rspectre](https://github.com/dgollahon/rspectre ) from 0.0.3 to 0.0.4.
- [Release notes](https://github.com/dgollahon/rspectre/releases )
- [Changelog](https://github.com/dgollahon/rspectre/blob/master/CHANGELOG.md )
- [Commits](https://github.com/dgollahon/rspectre/compare/v0.0.3...v0.0.4 )
---
updated-dependencies:
- dependency-name: rspectre
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 10:09:37 +00:00
dependabot[bot]
bce23504d1
Merge pull request #3004 from Growstuff/dependabot/bundler/bullet-7.0.1
2022-03-29 10:08:26 +00:00
dependabot[bot]
659a146e64
Bump bullet from 6.1.5 to 7.0.1
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.5 to 7.0.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.5...7.0.1 )
---
updated-dependencies:
- dependency-name: bullet
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 09:47:15 +00:00
dependabot[bot]
0f69d01701
Merge pull request #2999 from Growstuff/dependabot/bundler/rswag-api-2.5.1
2022-03-29 09:45:46 +00:00
dependabot[bot]
6bbeb56c4e
Bump rswag-api from 2.4.0 to 2.5.1
...
Bumps [rswag-api](https://github.com/rswag/rswag ) from 2.4.0 to 2.5.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.4.0...2.5.1 )
---
updated-dependencies:
- dependency-name: rswag-api
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 09:26:34 +00:00
dependabot[bot]
4f2e923754
Merge pull request #3002 from Growstuff/dependabot/bundler/rack-protection-2.2.0
2022-03-29 09:24:57 +00:00
dependabot[bot]
cdedaf1665
Bump rack-protection from 2.1.0 to 2.2.0
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.1.0...v2.2.0 )
---
updated-dependencies:
- dependency-name: rack-protection
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-29 09:09:23 +00:00
dependabot[bot]
405b1fa122
Merge pull request #3000 from Growstuff/dependabot/npm_and_yarn/ansi-regex-3.0.1
2022-03-29 09:08:00 +00:00
dependabot[bot]
7cac620014
Bump ansi-regex from 3.0.0 to 3.0.1
...
Bumps [ansi-regex](https://github.com/chalk/ansi-regex ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases )
- [Commits](https://github.com/chalk/ansi-regex/compare/v3.0.0...v3.0.1 )
---
updated-dependencies:
- dependency-name: ansi-regex
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-28 21:38:14 +00:00
dependabot[bot]
c1c48398da
Merge pull request #2997 from Growstuff/dependabot/bundler/rspec-rails-5.1.1
2022-03-28 21:29:28 +00:00
dependabot[bot]
2b4d9d89e3
Bump rspec-rails from 5.0.2 to 5.1.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.0.2 to 5.1.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.2...v5.1.1 )
---
updated-dependencies:
- dependency-name: rspec-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-28 21:02:11 +00:00
dependabot[bot]
3e9c7afab0
Merge pull request #2996 from Growstuff/dependabot/bundler/capybara-screenshot-1.0.26
2022-03-28 21:00:48 +00:00
dependabot[bot]
f8dd5ec2c8
Bump capybara-screenshot from 1.0.25 to 1.0.26
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.25 to 1.0.26.
- [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.25...v1.0.26 )
---
updated-dependencies:
- dependency-name: capybara-screenshot
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-28 20:42:48 +00:00
dependabot[bot]
65b057762b
Merge pull request #2950 from Growstuff/dependabot/bundler/chartkick-4.1.3
2022-03-28 20:41:31 +00:00
dependabot[bot]
cffc3544c5
Bump chartkick from 4.0.5 to 4.1.3
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 4.0.5 to 4.1.3.
- [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/v4.0.5...v4.1.3 )
---
updated-dependencies:
- dependency-name: chartkick
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-28 20:21:02 +00:00
dependabot[bot]
928b956b1f
Merge pull request #2989 from Growstuff/dependabot/bundler/letter_opener-1.8.1
2022-03-28 20:19:11 +00:00
dependabot[bot]
b3366ab97c
Bump letter_opener from 1.7.0 to 1.8.1
...
Bumps [letter_opener](https://github.com/ryanb/letter_opener ) from 1.7.0 to 1.8.1.
- [Release notes](https://github.com/ryanb/letter_opener/releases )
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.7.0...v1.8.1 )
---
updated-dependencies:
- dependency-name: letter_opener
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-28 20:01:53 +00:00
dependabot[bot]
e8ab889919
Merge pull request #2995 from Growstuff/dependabot/bundler/query_diet-0.7.1
2022-03-28 20:00:32 +00:00
dependabot[bot]
a0e0ba504f
Bump query_diet from 0.7.0 to 0.7.1
...
Bumps [query_diet](https://github.com/makandra/query_diet ) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/makandra/query_diet/releases )
- [Changelog](https://github.com/makandra/query_diet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/makandra/query_diet/compare/v0.7.0...v0.7.1 )
---
updated-dependencies:
- dependency-name: query_diet
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-28 19:41:54 +00:00
dependabot[bot]
473d3beecf
Merge pull request #2992 from Growstuff/dependabot/bundler/faraday-1.10.0
2022-03-28 19:40:30 +00:00
dependabot[bot]
0e9be0eff6
Bump faraday from 1.8.0 to 1.10.0
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.8.0 to 1.10.0.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v1.8.0...v1.10.0 )
---
updated-dependencies:
- dependency-name: faraday
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-28 19:23:49 +00:00
dependabot[bot]
b435af51e4
Merge pull request #2993 from Growstuff/dependabot/bundler/unicorn-6.1.0
2022-03-28 19:22:03 +00:00
Brenda Wallace
c1339bf7e3
Merge branch 'mainline' into dev
2022-03-29 08:07:18 +13:00
dependabot[bot]
2612b84621
Bump unicorn from 6.0.0 to 6.1.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 6.0.0 to 6.1.0.
---
updated-dependencies:
- dependency-name: unicorn
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-28 19:04:24 +00:00
Brenda Wallace
b2cd283b92
Merge pull request #2994 from Growstuff/dependabot/bundler/i18n-tasks-1.0.5
...
Bump i18n-tasks from 0.9.34 to 1.0.5
2022-03-29 08:03:20 +13:00
dependabot[bot]
595b4a02af
Bump i18n-tasks from 0.9.34 to 1.0.5
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.34 to 1.0.5.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.34...v1.0.5 )
---
updated-dependencies:
- dependency-name: i18n-tasks
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-28 07:03:18 +00:00
Daniel O'Connor
a077c4b372
Bump eslint further ( #2987 )
...
* Regen yarn.lock
* Bump eslint
2022-03-27 21:25:40 +10:30
Daniel O'Connor
b4cf8ee333
Rails 6.1 experiment ( #2910 )
...
* Rails 6.1
* Bump rails
Co-authored-by: Brenda Wallace <brenda@wallace.net.nz >
2022-03-27 20:40:35 +10:30
Daniel O'Connor
85ca296019
Ruby 2.7.5 ( #2977 )
...
* Ruby 2.7.5
* Update Gemfile.lock
Co-authored-by: Brenda Wallace <brenda@wallace.net.nz >
Co-authored-by: Brenda Wallace <brenda@wallace.net.nz >
2022-03-27 20:39:32 +10:30
Daniel O'Connor
ea5486ffe1
Swap percy over ( #2986 )
...
* Swap percy over
* Swap require over
* Change API
* Update package.json
2022-03-27 11:44:18 +10:30
Daniel O'Connor
368432cd66
Merge pull request #2911 from Growstuff/snyk-upgrade-5cf0b15a1785277a00bdfb8d28bd4470
...
[Snyk] Upgrade mdbootstrap from 4.19.2 to 4.20.0
2022-03-27 03:04:10 +10:30
dependabot[bot]
665043f7d1
Merge pull request #2962 from Growstuff/dependabot/bundler/dalli-3.2.1
2022-03-26 16:26:03 +00:00
dependabot[bot]
aed09abc8f
Bump dalli from 2.7.11 to 3.2.1
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.11 to 3.2.1.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/main/History.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.11...v3.2.1 )
---
updated-dependencies:
- dependency-name: dalli
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 16:07:15 +00:00
Daniel O'Connor
52e04abcfc
Merge pull request #2984 from Growstuff/rails7-prep
...
Bump discard
2022-03-27 02:36:01 +10:30
Daniel O'Connor
1f3b84928d
Merge branch 'dev' into snyk-upgrade-5cf0b15a1785277a00bdfb8d28bd4470
2022-03-27 02:33:37 +10:30
Daniel O'Connor
a59edeb6c9
Merge pull request #2985 from Growstuff/bump-coffeelint-further
...
Swap to replacement coffeelint
2022-03-27 02:29:22 +10:30
dependabot[bot]
8c74bc39fe
Merge pull request #2920 from Growstuff/dependabot/bundler/webdrivers-4.7.0
2022-03-26 15:56:44 +00:00
dependabot[bot]
f1fe70b8a6
Bump webdrivers from 4.6.1 to 4.7.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases )
- [Changelog](https://github.com/titusfortner/webdrivers/blob/main/CHANGELOG.md )
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.6.1...v4.7.0 )
---
updated-dependencies:
- dependency-name: webdrivers
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 15:34:59 +00:00
dependabot[bot]
e6a4601b03
Merge pull request #2927 from Growstuff/dependabot/bundler/capybara-3.36.0
2022-03-26 15:33:52 +00:00
Daniel O'Connor
3c8ecd67ad
Swap to replacement
2022-03-27 01:58:16 +10:30
Daniel O'Connor
2c0a9d17aa
Merge branch 'bump-ruby' into bump-ruby-3.0
2022-03-27 01:46:54 +10:30
Daniel O'Connor
e77d4a1e67
Ruby 2.7.5
2022-03-27 01:45:58 +10:30
dependabot[bot]
6cdc5e1fea
Bump capybara from 3.35.3 to 3.36.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.35.3 to 3.36.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.35.3...3.36.0 )
---
updated-dependencies:
- dependency-name: capybara
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 15:15:22 +00:00
Daniel O'Connor
c19dcb1da0
Merge pull request #2982 from Growstuff/bump-eslint-and-friends
...
Bump eslint
2022-03-27 01:44:09 +10:30
Daniel O'Connor
9c660fb20e
Merge pull request #2981 from Growstuff/bump-coffeelint2
...
Bump coffeelint
2022-03-27 01:43:51 +10:30
Daniel O'Connor
4b9750e91e
Bump discard
2022-03-27 01:42:45 +10:30
Daniel O'Connor
cc3d17e224
Merge pull request #2979 from Growstuff/unpin/pg
...
Bump pg
2022-03-27 01:24:42 +10:30
dependabot[bot]
a567fa5df9
Merge pull request #2949 from Growstuff/dependabot/bundler/oj-3.13.11
2022-03-26 14:50:58 +00:00
Daniel O'Connor
449a0dfab4
Bump eslint
2022-03-27 01:11:45 +10:30
Daniel O'Connor
9c7aa2f125
Bump coffeelint
2022-03-27 01:08:43 +10:30
dependabot[bot]
10c429cb87
Bump oj from 3.13.8 to 3.13.11
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.8 to 3.13.11.
- [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.13.8...v3.13.11 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 14:34:19 +00:00
Daniel O'Connor
2362f85a71
Merge pull request #2976 from Growstuff/upgrade/jshint
...
Upgrade jshint
2022-03-27 01:03:18 +10:30
dependabot[bot]
94d4487a39
Merge pull request #2966 from Growstuff/dependabot/github_actions/actions/setup-node-3
2022-03-26 14:32:02 +00:00
Daniel O'Connor
df825c9b13
Bump pg
2022-03-27 00:58:37 +10:30
Daniel O'Connor
841e89232b
Bump to Ruby 3
2022-03-27 00:56:12 +10:30
Daniel O'Connor
e1d6e56595
Ruby 2.7.5
2022-03-27 00:46:33 +10:30
dependabot[bot]
d3d2c2e06b
Bump actions/setup-node from 2.4.1 to 3
...
Bumps [actions/setup-node](https://github.com/actions/setup-node ) from 2.4.1 to 3.
- [Release notes](https://github.com/actions/setup-node/releases )
- [Commits](https://github.com/actions/setup-node/compare/v2.4.1...v3 )
---
updated-dependencies:
- dependency-name: actions/setup-node
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 14:14:30 +00:00
Daniel O'Connor
e3b44d8b31
Merge pull request #2971 from Growstuff/dependabot/bundler/geocoder-1.7.5
...
Bump geocoder from 1.6.7 to 1.7.5
2022-03-27 00:43:47 +10:30
dependabot[bot]
99c3ef15c1
Bump geocoder from 1.6.7 to 1.7.5
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.6.7 to 1.7.5.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.7...v1.7.5 )
---
updated-dependencies:
- dependency-name: geocoder
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 14:04:09 +00:00
Daniel O'Connor
42ed1b3f00
Merge pull request #2957 from Growstuff/snyk-upgrade-66801b2c67c2748673bcafadb52b681c
...
[Snyk] Upgrade @percy/agent from 0.28.6 to 0.28.7
2022-03-27 00:32:49 +10:30
Daniel O'Connor
6da2a0b2c5
Upgrade jshint
2022-03-27 00:23:13 +10:30
Daniel O'Connor
67232b7755
Merge pull request #2959 from Growstuff/dependabot/bundler/sidekiq-6.4.1
...
Bump sidekiq from 6.2.2 to 6.4.1
2022-03-27 00:17:16 +10:30
dependabot[bot]
0c27582338
Bump sidekiq from 6.2.2 to 6.4.1
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.2.2 to 6.4.1.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.2.2...v6.4.1 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 13:47:06 +00:00
Daniel O'Connor
bdf9778276
Merge pull request #2967 from Growstuff/dependabot/bundler/image_processing-1.12.2
...
Bump image_processing from 1.12.1 to 1.12.2
2022-03-27 00:15:40 +10:30
dependabot[bot]
832573e27b
Bump image_processing from 1.12.1 to 1.12.2
...
Bumps [image_processing](https://github.com/janko/image_processing ) from 1.12.1 to 1.12.2.
- [Release notes](https://github.com/janko/image_processing/releases )
- [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md )
- [Commits](https://github.com/janko/image_processing/compare/v1.12.1...v1.12.2 )
---
updated-dependencies:
- dependency-name: image_processing
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 13:40:51 +00:00
dependabot[bot]
f5802d97e3
Merge pull request #2973 from Growstuff/dependabot/npm_and_yarn/node-fetch-2.6.7
2022-03-26 13:39:35 +00:00
dependabot[bot]
8a9b4bc817
Bump node-fetch from 2.6.1 to 2.6.7
...
Bumps [node-fetch](https://github.com/node-fetch/node-fetch ) from 2.6.1 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases )
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7 )
---
updated-dependencies:
- dependency-name: node-fetch
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 13:23:10 +00:00
Daniel O'Connor
15f4bb39d2
Merge pull request #2975 from Growstuff/update/rails
...
Bump Rails 6
2022-03-26 23:51:58 +10:30
dependabot[bot]
d436ec0239
Merge pull request #2972 from Growstuff/dependabot/github_actions/actions/cache-3
2022-03-26 13:09:47 +00:00
Daniel O'Connor
7602b5253d
Bump Rails 6
2022-03-26 23:26:40 +10:30
dependabot[bot]
2d891f0e28
Bump actions/cache from 2.1.6 to 3
...
Bumps [actions/cache](https://github.com/actions/cache ) from 2.1.6 to 3.
- [Release notes](https://github.com/actions/cache/releases )
- [Commits](https://github.com/actions/cache/compare/v2.1.6...v3 )
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 12:49:57 +00:00
Daniel O'Connor
5f2fd10b53
Merge pull request #2974 from Growstuff/CloCkWeRX-patch-1
...
Update Gemfile.lock - fix heroku deploy complaint
2022-03-26 23:18:52 +10:30
Daniel O'Connor
88cf877a25
Specific version
2022-03-26 23:10:17 +10:30
dependabot[bot]
c1232500c5
Merge pull request #2919 from Growstuff/dependabot/bundler/faraday_middleware-1.2.0
2022-03-26 12:31:39 +00:00
Daniel O'Connor
5af61044b5
Update Gemfile.lock
2022-03-26 22:54:44 +10:30
dependabot[bot]
baa40be59b
Bump faraday_middleware from 1.1.0 to 1.2.0
...
Bumps [faraday_middleware](https://github.com/lostisland/faraday_middleware ) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/lostisland/faraday_middleware/releases )
- [Commits](https://github.com/lostisland/faraday_middleware/compare/v1.1.0...v1.2.0 )
---
updated-dependencies:
- dependency-name: faraday_middleware
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 12:14:27 +00:00
dependabot[bot]
64ffc2eb7c
Merge pull request #2968 from Growstuff/dependabot/github_actions/actions/checkout-3
2022-03-26 12:13:17 +00:00
dependabot[bot]
6dc6bb79ec
Bump actions/checkout from 2.3.4 to 3
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 2.3.4 to 3.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v2.3.4...v3 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-26 11:50:41 +00:00
Daniel O'Connor
6581096480
Merge pull request #2960 from Growstuff/dependabot/bundler/puma-5.6.2
...
Bump puma from 5.5.0 to 5.6.2
2022-03-26 22:19:45 +10:30
dependabot[bot]
1f0db444cd
Bump puma from 5.5.0 to 5.6.2
...
Bumps [puma](https://github.com/puma/puma ) from 5.5.0 to 5.6.2.
- [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.5.0...v5.6.2 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-02-11 21:49:39 +00:00
snyk-bot
df36146b69
fix: upgrade @percy/agent from 0.28.6 to 0.28.7
...
Snyk has created this PR to upgrade @percy/agent from 0.28.6 to 0.28.7.
See this package in npm:
See this project in Snyk:
https://app.snyk.io/org/br3nda/project/ef7d5298-540a-4e7a-8b3c-ffa7aebff03c?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-02-01 00:03:04 +00:00
snyk-bot
579e8683ec
fix: upgrade mdbootstrap from 4.19.2 to 4.20.0
...
Snyk has created this PR to upgrade mdbootstrap from 4.19.2 to 4.20.0.
See this package in npm:
See this project in Snyk:
https://app.snyk.io/org/br3nda/project/ef7d5298-540a-4e7a-8b3c-ffa7aebff03c?utm_source=github&utm_medium=referral&page=upgrade-pr
2021-10-07 06:46:23 +00:00
Daniel O'Connor
2ac3605173
Merge pull request #2837 from Growstuff/snyk-upgrade-c69c15ef11625d15424539ca097b443c
...
[Snyk] Upgrade mdbootstrap from 4.12.0 to 4.19.2
2021-10-07 01:13:00 +10:30
Daniel O'Connor
19e10788d2
Merge branch 'dev' into snyk-upgrade-c69c15ef11625d15424539ca097b443c
2021-10-06 23:02:03 +10:30
Daniel O'Connor
9f0a121e7f
Merge pull request #2908 from Growstuff/dependabot/bundler/faraday-1.8.0
...
Bump faraday from 1.5.1 to 1.8.0
2021-10-06 22:53:27 +10:30
dependabot[bot]
30fc6f2e5b
Bump faraday from 1.5.1 to 1.8.0
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.5.1 to 1.8.0.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v1.5.1...v1.8.0 )
---
updated-dependencies:
- dependency-name: faraday
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-06 09:15:16 +00:00
Daniel O'Connor
ac0ffd65e1
Merge pull request #2907 from Growstuff/dependabot/bundler/haml-5.2.2
...
Bump haml from 5.2.1 to 5.2.2
2021-10-06 19:43:22 +10:30
Daniel O'Connor
f773324c5c
Merge pull request #2906 from Growstuff/dependabot/bundler/will_paginate-3.3.1
...
Bump will_paginate from 3.3.0 to 3.3.1
2021-10-06 19:42:48 +10:30
Daniel O'Connor
f49b69a855
Merge pull request #2901 from Growstuff/dependabot/bundler/listen-3.7.0
...
Bump listen from 3.5.1 to 3.7.0
2021-10-06 19:42:27 +10:30
Daniel O'Connor
e2fb67efac
Merge pull request #2909 from Growstuff/dependabot/bundler/puma-5.5.0
...
Bump puma from 5.3.2 to 5.5.0
2021-10-06 19:42:03 +10:30
Daniel O'Connor
40f6515379
Merge pull request #2904 from Growstuff/dependabot/bundler/faraday_middleware-1.1.0
...
Bump faraday_middleware from 1.0.0 to 1.1.0
2021-10-06 19:41:45 +10:30
dependabot[bot]
dca7bbc4a5
Bump puma from 5.3.2 to 5.5.0
...
Bumps [puma](https://github.com/puma/puma ) from 5.3.2 to 5.5.0.
- [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.3.2...v5.5.0 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-06 07:16:13 +00:00
dependabot[bot]
006eb9e7f0
Bump haml from 5.2.1 to 5.2.2
...
Bumps [haml](https://github.com/haml/haml ) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/5.2.1...v5.2.2 )
---
updated-dependencies:
- dependency-name: haml
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-06 07:09:51 +00:00
dependabot[bot]
a771414048
Bump will_paginate from 3.3.0 to 3.3.1
...
Bumps [will_paginate](https://github.com/mislav/will_paginate ) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/mislav/will_paginate/releases )
- [Commits](https://github.com/mislav/will_paginate/compare/v3.3.0...v3.3.1 )
---
updated-dependencies:
- dependency-name: will_paginate
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-06 07:02:46 +00:00
dependabot[bot]
b106f91c17
Bump faraday_middleware from 1.0.0 to 1.1.0
...
Bumps [faraday_middleware](https://github.com/lostisland/faraday_middleware ) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/lostisland/faraday_middleware/releases )
- [Commits](https://github.com/lostisland/faraday_middleware/compare/v1.0.0...v1.1.0 )
---
updated-dependencies:
- dependency-name: faraday_middleware
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-06 02:24:14 +00:00
dependabot[bot]
6c72ab8d09
Bump listen from 3.5.1 to 3.7.0
...
Bumps [listen](https://github.com/guard/listen ) from 3.5.1 to 3.7.0.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.5.1...v3.7.0 )
---
updated-dependencies:
- dependency-name: listen
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-06 02:23:50 +00:00
Daniel O'Connor
10bbad3aa1
Merge pull request #2903 from Growstuff/dependabot/bundler/webdrivers-4.6.1
...
Bump webdrivers from 4.6.0 to 4.6.1
2021-10-06 12:52:22 +10:30
dependabot[bot]
3cbc3e5ec0
Bump webdrivers from 4.6.0 to 4.6.1
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.6.0 to 4.6.1.
- [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.6.0...v4.6.1 )
---
updated-dependencies:
- dependency-name: webdrivers
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 14:09:37 +00:00
Daniel O'Connor
4ec9216ee9
Merge pull request #2900 from Growstuff/dependabot/bundler/active_utils-3.3.18
...
Bump active_utils from 3.3.17 to 3.3.18
2021-10-06 00:38:27 +10:30
dependabot[bot]
8577ad697b
Bump active_utils from 3.3.17 to 3.3.18
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.17 to 3.3.18.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.17...v3.3.18 )
---
updated-dependencies:
- dependency-name: active_utils
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 13:39:24 +00:00
Daniel O'Connor
52e3801716
Merge pull request #2833 from Growstuff/dependabot/github_actions/actions/cache-2.1.6
...
Bump actions/cache from 2.1.5 to 2.1.6
2021-10-06 00:08:11 +10:30
dependabot[bot]
9dec52f4ae
Bump actions/cache from 2.1.5 to 2.1.6
...
Bumps [actions/cache](https://github.com/actions/cache ) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases )
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 13:37:06 +00:00
Daniel O'Connor
71cfd4a740
Merge pull request #2905 from Growstuff/dependabot/bundler/faker-2.19.0
...
Bump faker from 2.18.0 to 2.19.0
2021-10-06 00:06:52 +10:30
Daniel O'Connor
39aa65c4bb
Merge pull request #2902 from Growstuff/dependabot/bundler/sidekiq-6.2.2
...
Bump sidekiq from 6.2.1 to 6.2.2
2021-10-06 00:06:27 +10:30
dependabot[bot]
f6e2c3469c
Bump faker from 2.18.0 to 2.19.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.18.0 to 2.19.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.18.0...v2.19.0 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 13:35:40 +00:00
dependabot[bot]
7da0c6ba2a
Bump sidekiq from 6.2.1 to 6.2.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.2.1...v6.2.2 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 13:35:24 +00:00
Daniel O'Connor
568d76a3e3
Merge pull request #2879 from Growstuff/snyk-fix-fc75124a418fb996ab551d820ae768f6
...
[Snyk] Fix for 1 vulnerabilities
2021-10-06 00:04:21 +10:30
Daniel O'Connor
a93af8b0ca
Merge pull request #2860 from Growstuff/dependabot/bundler/chartkick-4.0.5
...
Bump chartkick from 4.0.4 to 4.0.5
2021-10-06 00:03:38 +10:30
Daniel O'Connor
3581cf0af7
Merge pull request #2891 from Growstuff/dependabot/bundler/searchkick-4.6.1
...
Bump searchkick from 4.4.4 to 4.6.1
2021-10-06 00:03:28 +10:30
Daniel O'Connor
dbe6bc0db5
Merge pull request #2899 from Growstuff/dependabot/bundler/rspec-rails-5.0.2
...
Bump rspec-rails from 5.0.1 to 5.0.2
2021-10-06 00:03:17 +10:30
Daniel O'Connor
956a3823f4
Merge branch 'dev' into snyk-fix-fc75124a418fb996ab551d820ae768f6
2021-10-05 23:42:54 +10:30
dependabot[bot]
4f3a29cfc4
Bump chartkick from 4.0.4 to 4.0.5
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 4.0.4 to 4.0.5.
- [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/v4.0.4...v4.0.5 )
---
updated-dependencies:
- dependency-name: chartkick
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 13:11:38 +00:00
dependabot[bot]
366ccb8f1d
Bump rspec-rails from 5.0.1 to 5.0.2
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.1...v5.0.2 )
---
updated-dependencies:
- dependency-name: rspec-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 13:10:39 +00:00
dependabot[bot]
6d9751afd4
Bump searchkick from 4.4.4 to 4.6.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.4.4 to 4.6.1.
- [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.4.4...v4.6.1 )
---
updated-dependencies:
- dependency-name: searchkick
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 13:10:21 +00:00
Daniel O'Connor
988158352f
Merge pull request #2848 from Growstuff/dependabot/bundler/cancancan-3.3.0
...
Bump cancancan from 3.2.1 to 3.3.0
2021-10-05 23:39:03 +10:30
Daniel O'Connor
29d6111ac2
Merge pull request #2876 from Growstuff/dependabot/bundler/loofah-2.12.0
...
Bump loofah from 2.9.1 to 2.12.0
2021-10-05 23:38:42 +10:30
Daniel O'Connor
6a97e6b002
Merge pull request #2882 from Growstuff/dependabot/bundler/scout_apm-4.1.2
...
Bump scout_apm from 4.0.4 to 4.1.2
2021-10-05 23:38:21 +10:30
Daniel O'Connor
fa10e88c0b
Merge pull request #2898 from Growstuff/dependabot/bundler/bullet-6.1.5
...
Bump bullet from 6.1.4 to 6.1.5
2021-10-05 23:37:46 +10:30
Daniel O'Connor
362228e1f5
Merge branch 'dev' into snyk-fix-fc75124a418fb996ab551d820ae768f6
2021-10-05 23:22:41 +10:30
Daniel O'Connor
d7a16034f9
Bump rails
2021-10-05 23:17:55 +10:30
dependabot[bot]
e20a8f5586
Bump bullet from 6.1.4 to 6.1.5
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.4 to 6.1.5.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.4...6.1.5 )
---
updated-dependencies:
- dependency-name: bullet
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 12:44:23 +00:00
dependabot[bot]
339db701d7
Bump loofah from 2.9.1 to 2.12.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.9.1 to 2.12.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.9.1...v2.12.0 )
---
updated-dependencies:
- dependency-name: loofah
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 12:44:22 +00:00
dependabot[bot]
78291ef12d
Bump scout_apm from 4.0.4 to 4.1.2
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 4.0.4 to 4.1.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/v4.0.4...v4.1.2 )
---
updated-dependencies:
- dependency-name: scout_apm
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 12:44:22 +00:00
dependabot[bot]
44b12900dd
Bump cancancan from 3.2.1 to 3.3.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.2.1...3.3.0 )
---
updated-dependencies:
- dependency-name: cancancan
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-05 12:44:19 +00:00
Daniel O'Connor
583d394181
Merge pull request #2861 from Growstuff/dependabot/bundler/rake-13.0.6
...
Bump rake from 13.0.3 to 13.0.6
2021-10-05 23:13:02 +10:30
Daniel O'Connor
3dcdf9d9b7
Merge pull request #2893 from Growstuff/dependabot/github_actions/actions/setup-node-2.4.1
...
Bump actions/setup-node from 2.4.0 to 2.4.1
2021-10-05 23:06:21 +10:30
Daniel O'Connor
e35af823ce
Merge pull request #2895 from Growstuff/dependabot/bundler/oj-3.13.8
...
Bump oj from 3.12.1 to 3.13.8
2021-10-05 23:06:00 +10:30
Daniel O'Connor
1e48ae8c7e
Merge pull request #2885 from Growstuff/snyk-fix-ba9162e09c21a7dd37df12fd631634b0
...
[Snyk] Security upgrade @percy/agent from 0.3.1 to 0.28.6
2021-10-05 23:05:12 +10:30
Daniel O'Connor
0734d17af9
Merge pull request #2892 from Growstuff/dependabot/bundler/nokogiri-1.12.5
...
Bump nokogiri from 1.11.7 to 1.12.5
2021-10-05 23:04:37 +10:30
Daniel O'Connor
a8411a4b12
Merge branch 'dev' into snyk-fix-ba9162e09c21a7dd37df12fd631634b0
2021-10-05 22:15:48 +10:30
Daniel O'Connor
9d31c9a492
Merge branch 'dev' into dependabot/github_actions/actions/setup-node-2.4.1
2021-10-05 22:12:14 +10:30
Daniel O'Connor
dfcf608e4b
Merge branch 'dev' into dependabot/bundler/oj-3.13.8
2021-10-05 22:04:41 +10:30
Daniel O'Connor
63a2027ba7
Merge branch 'dev' into dependabot/bundler/rake-13.0.6
2021-10-05 22:04:05 +10:30
Daniel O'Connor
0caa95384c
Merge branch 'dev' into dependabot/bundler/nokogiri-1.12.5
2021-10-05 22:03:48 +10:30
Daniel O'Connor
667647f7cd
Merge pull request #2897 from Growstuff/revert-2872-accessibilityIssues
...
Revert "Accessibility: Nav bar’s icon links"
2021-10-05 22:03:17 +10:30
Daniel O'Connor
e23a274ce7
Revert "Accessibility: Nav bar’s icon links"
2021-10-05 21:32:33 +10:30
dependabot[bot]
3d9e1ffab3
Bump oj from 3.12.1 to 3.13.8
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.12.1 to 3.13.8.
- [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.12.1...v3.13.8 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-09-29 07:29:13 +00:00
dependabot[bot]
9e4cee9c4e
Bump actions/setup-node from 2.4.0 to 2.4.1
...
Bumps [actions/setup-node](https://github.com/actions/setup-node ) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/actions/setup-node/releases )
- [Commits](https://github.com/actions/setup-node/compare/v2.4.0...v2.4.1 )
---
updated-dependencies:
- dependency-name: actions/setup-node
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-09-28 07:12:01 +00:00
dependabot[bot]
dd49b4eb7f
Bump nokogiri from 1.11.7 to 1.12.5
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.7 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.7...v1.12.5 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-09-27 20:32:36 +00:00
snyk-bot
e49e70d2f3
fix: package.json & yarn.lock to reduce vulnerabilities
...
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-AXIOS-1579269
2021-09-06 05:50:46 +00:00
snyk-bot
4053ec6d62
fix: Gemfile to reduce vulnerabilities
...
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-RAILS-1567785
2021-08-20 22:52:04 +00:00
dependabot[bot]
0f7e3738b6
Bump rake from 13.0.3 to 13.0.6
...
Bumps [rake](https://github.com/ruby/rake ) from 13.0.3 to 13.0.6.
- [Release notes](https://github.com/ruby/rake/releases )
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc )
- [Commits](https://github.com/ruby/rake/compare/v13.0.3...v13.0.6 )
---
updated-dependencies:
- dependency-name: rake
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-08-09 08:24:00 +00:00
Brenda Wallace
c8b547050d
Merge pull request #2827 from Growstuff/dependabot/bundler/jsonapi-resources-0.10.5
...
Bump jsonapi-resources from 0.10.4 to 0.10.5
2021-08-09 19:29:46 +12:00
Brenda Wallace
e36de8afe5
Merge pull request #2870 from Growstuff/dependabot/github_actions/actions/setup-node-2.4.0
...
Bump actions/setup-node from 2.2.0 to 2.4.0
2021-08-09 19:29:19 +12:00
Brenda Wallace
d8601a6682
Merge pull request #2872 from le-jun/accessibilityIssues
...
Accessibility: Nav bar’s icon links
2021-08-09 19:28:54 +12:00
LeJun
afbde883d7
Created alt text
...
Missing alt text for nav bar icons
2021-08-06 19:18:21 +02:00
le-jun
2e900194ee
Added myself to contributors list
2021-08-06 17:10:20 +02:00
le-jun
96fe52e916
Updated pear.png
...
Updated the old file with an export from the svg
2021-08-06 14:59:01 +02:00
le-jun
b573515124
Delete pear.png
2021-08-06 14:58:14 +02:00
le-jun
ddfae74013
Added new image files
...
Converted the old "pear logo" into an svg file and replaced the two Facebook’s pictures.
2021-08-06 14:12:00 +02:00
le-jun
511795b979
Delete facebook-thumbnail.png
...
Deleted old png
2021-08-06 14:09:11 +02:00
le-jun
2fc2466669
Delete facebook-login-splash.png
...
Deleted old png
2021-08-06 14:08:58 +02:00
dependabot[bot]
71e37aba03
Bump actions/setup-node from 2.2.0 to 2.4.0
...
Bumps [actions/setup-node](https://github.com/actions/setup-node ) from 2.2.0 to 2.4.0.
- [Release notes](https://github.com/actions/setup-node/releases )
- [Commits](https://github.com/actions/setup-node/compare/v2.2.0...v2.4.0 )
---
updated-dependencies:
- dependency-name: actions/setup-node
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-08-06 07:09:30 +00:00
dependabot[bot]
2eea02c6d6
Bump jsonapi-resources from 0.10.4 to 0.10.5
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.10.4 to 0.10.5.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.10.4...v0.10.5 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-13 21:10:30 +00:00
dependabot[bot]
247e1023f3
Merge pull request #2849 from Growstuff/dependabot/bundler/haml_lint-0.37.1
2021-07-13 21:03:14 +00:00
dependabot[bot]
f0cdce6d0f
Bump haml_lint from 0.37.0 to 0.37.1
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.37.0 to 0.37.1.
- [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.37.0...v0.37.1 )
---
updated-dependencies:
- dependency-name: haml_lint
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-13 20:45:43 +00:00
dependabot[bot]
fd2e8133ab
Merge pull request #2852 from Growstuff/dependabot/github_actions/actions/setup-node-2.2.0
2021-07-13 20:41:54 +00:00
dependabot[bot]
235c237e46
Bump actions/setup-node from 2.1.5 to 2.2.0
...
Bumps [actions/setup-node](https://github.com/actions/setup-node ) from 2.1.5 to 2.2.0.
- [Release notes](https://github.com/actions/setup-node/releases )
- [Commits](https://github.com/actions/setup-node/compare/v2.1.5...v2.2.0 )
---
updated-dependencies:
- dependency-name: actions/setup-node
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-13 20:17:34 +00:00
Brenda Wallace
6878eebe54
Merge pull request #2857 from Growstuff/dependabot/bundler/faraday-1.5.1
...
Bump faraday from 1.4.2 to 1.5.1
2021-07-14 08:16:36 +12:00
Brenda Wallace
54ded6cdb4
Merge pull request #2858 from Growstuff/dependabot/bundler/oj-3.12.1
...
Bump oj from 3.11.5 to 3.12.1
2021-07-14 08:16:07 +12:00
Brenda Wallace
0ff2dabca7
Merge pull request #2859 from Growstuff/dependabot/bundler/addressable-2.8.0
...
Bump addressable from 2.7.0 to 2.8.0
2021-07-14 08:15:25 +12:00
dependabot[bot]
0b5fd8d59c
Bump addressable from 2.7.0 to 2.8.0
...
Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases )
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.7.0...addressable-2.8.0 )
---
updated-dependencies:
- dependency-name: addressable
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-12 17:20:43 +00:00
dependabot[bot]
a42d1519cd
Bump oj from 3.11.5 to 3.12.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.5 to 3.12.1.
- [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.11.5...v3.12.1 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-12 07:08:42 +00:00
dependabot[bot]
2a6fe47213
Bump faraday from 1.4.2 to 1.5.1
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.4.2 to 1.5.1.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v1.4.2...v1.5.1 )
---
updated-dependencies:
- dependency-name: faraday
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-12 07:01:49 +00:00
snyk-bot
625762f722
fix: upgrade mdbootstrap from 4.12.0 to 4.19.2
...
Snyk has created this PR to upgrade mdbootstrap from 4.12.0 to 4.19.2.
See this package in npm:
See this project in Snyk:
https://app.snyk.io/org/br3nda/project/ef7d5298-540a-4e7a-8b3c-ffa7aebff03c?utm_source=github&utm_medium=upgrade-pr
2021-06-02 22:10:31 +00:00
Daniel O'Connor
af00ee496f
Merge pull request #2828 from Growstuff/dependabot/bundler/puma-5.3.2
...
Bump puma from 5.3.1 to 5.3.2
2021-05-26 12:33:10 +09:30
dependabot[bot]
b4e46bbce6
Bump puma from 5.3.1 to 5.3.2
...
Bumps [puma](https://github.com/puma/puma ) from 5.3.1 to 5.3.2.
- [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.3.1...v5.3.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-25 09:11:09 +00:00
Brenda Wallace
3853e8694a
Merge pull request #2830 from Growstuff/dependabot/bundler/faraday-1.4.2
...
Bump faraday from 1.4.1 to 1.4.2
2021-05-25 21:09:13 +12:00
dependabot[bot]
a84d6d3243
Bump faraday from 1.4.1 to 1.4.2
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v1.4.1...v1.4.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-25 07:22:31 +00:00
Brenda Wallace
02afbbad81
Merge pull request #2824 from Growstuff/dependabot/bundler/faker-2.18.0
...
Bump faker from 2.17.0 to 2.18.0
2021-05-20 17:27:34 +12:00
dependabot[bot]
82f980acd1
Bump faker from 2.17.0 to 2.18.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.17.0 to 2.18.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.17.0...v2.18.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-17 22:18:09 +00:00
Brenda Wallace
c13a5a06c6
Merge pull request #2826 from Growstuff/dependabot/bundler/nokogiri-1.11.4
...
Bump nokogiri from 1.11.3 to 1.11.4
2021-05-18 10:16:19 +12:00
dependabot[bot]
1d7a9bdaad
Bump nokogiri from 1.11.3 to 1.11.4
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.3 to 1.11.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.3...v1.11.4 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-17 21:53:02 +00:00
Brenda Wallace
e0c4c77568
Merge pull request #2821 from Growstuff/dependabot/github_actions/actions/cache-2.1.5
...
Bump actions/cache from 2 to 2.1.5
2021-05-17 08:33:02 +12:00
Brenda Wallace
b3a2c3ed8e
Merge pull request #2822 from Growstuff/dependabot/github_actions/actions/checkout-2.3.4
...
Bump actions/checkout from 2 to 2.3.4
2021-05-17 08:32:43 +12:00
Brenda Wallace
84301beaad
Merge pull request #2820 from Growstuff/dependabot/github_actions/actions/setup-ruby-1.1.3
...
Bump actions/setup-ruby from 1 to 1.1.3
2021-05-17 08:32:22 +12:00
dependabot[bot]
72f34765fa
Bump actions/cache from 2 to 2.1.5
...
Bumps [actions/cache](https://github.com/actions/cache ) from 2 to 2.1.5.
- [Release notes](https://github.com/actions/cache/releases )
- [Commits](https://github.com/actions/cache/compare/v2...v2.1.5 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-12 14:37:39 +00:00
dependabot[bot]
b71cafa922
Bump actions/setup-ruby from 1 to 1.1.3
...
Bumps [actions/setup-ruby](https://github.com/actions/setup-ruby ) from 1 to 1.1.3.
- [Release notes](https://github.com/actions/setup-ruby/releases )
- [Commits](https://github.com/actions/setup-ruby/compare/v1...v1.1.3 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-12 14:37:39 +00:00
dependabot[bot]
e95ff8e423
Bump actions/checkout from 2 to 2.3.4
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 2 to 2.3.4.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v2...v2.3.4 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-12 14:37:38 +00:00
Daniel O'Connor
58f7bd1002
Merge pull request #2810 from Growstuff/dependabot/bundler/i18n-tasks-0.9.34
...
Bump i18n-tasks from 0.9.31 to 0.9.34
2021-05-13 00:06:59 +09:30
Daniel O'Connor
cf97fd0fb6
Merge branch 'dev' into dependabot/bundler/i18n-tasks-0.9.34
2021-05-12 14:15:41 +09:30
Daniel O'Connor
89f5a222c9
Merge pull request #2811 from Growstuff/dependabot/bundler/devise-4.8.0
...
Bump devise from 4.7.3 to 4.8.0
2021-05-12 02:29:26 +09:30
Daniel O'Connor
3310fe7753
Merge pull request #2812 from Growstuff/dependabot/bundler/chartkick-4.0.4
...
Bump chartkick from 4.0.3 to 4.0.4
2021-05-12 02:29:08 +09:30
Daniel O'Connor
ee8bc86ea7
Merge pull request #2819 from Growstuff/dependabot/bundler/puma-5.3.1
...
Bump puma from 5.2.2 to 5.3.1
2021-05-12 02:28:54 +09:30
Daniel O'Connor
4590b848a3
Merge pull request #2818 from Growstuff/dependabot/github_actions/actions/setup-node-2.1.5
...
Bump actions/setup-node from 2.pre.beta to 2.1.5
2021-05-12 02:28:41 +09:30
Daniel O'Connor
44edafbe69
Merge pull request #2816 from Growstuff/dependabot/bundler/factory_bot_rails-6.2.0
...
Bump factory_bot_rails from 6.1.0 to 6.2.0
2021-05-12 02:28:22 +09:30
dependabot[bot]
228e4433f1
Bump devise from 4.7.3 to 4.8.0
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.3 to 4.8.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.3...v4.8.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-11 16:33:21 +00:00
dependabot[bot]
649f6b0fc0
Bump factory_bot_rails from 6.1.0 to 6.2.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.1.0...v6.2.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-11 16:32:53 +00:00
dependabot[bot]
502c42c36d
Bump puma from 5.2.2 to 5.3.1
...
Bumps [puma](https://github.com/puma/puma ) from 5.2.2 to 5.3.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/v5.2.2...v5.3.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-11 16:32:20 +00:00
dependabot[bot]
ee9c1491b0
Bump chartkick from 4.0.3 to 4.0.4
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 4.0.3 to 4.0.4.
- [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/v4.0.3...v4.0.4 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-11 16:32:17 +00:00
dependabot[bot]
cc8e924a6e
Bump actions/setup-node from 2.pre.beta to 2.1.5
...
Bumps [actions/setup-node](https://github.com/actions/setup-node ) from 2.pre.beta to 2.1.5.
- [Release notes](https://github.com/actions/setup-node/releases )
- [Commits](https://github.com/actions/setup-node/compare/v2-beta...v2.1.5 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-11 16:30:46 +00:00
Daniel O'Connor
b2f7ebb1c6
Merge pull request #2814 from Growstuff/dependabot/npm_and_yarn/lodash-4.17.21
...
Bump lodash from 4.17.20 to 4.17.21
2021-05-12 01:59:57 +09:30
dependabot[bot]
d621e48d28
Bump lodash from 4.17.20 to 4.17.21
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-11 16:04:55 +00:00
Daniel O'Connor
401edbf106
Update CONTRIBUTORS.md
2021-05-12 01:30:35 +09:30
dependabot[bot]
4d5dac27ab
Bump i18n-tasks from 0.9.31 to 0.9.34
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.31 to 0.9.34.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.31...v0.9.34 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-04-29 09:45:55 +00:00
Brenda Wallace
058157a58f
Merge pull request #2807 from Growstuff/dependabot/bundler/oauth-0.5.6
...
[Security] Bump oauth from 0.5.4 to 0.5.6
2021-04-29 15:06:41 +12:00
Brenda Wallace
d5855c08cb
Merge pull request #2808 from Growstuff/dependabot/add-v2-config-file
...
Upgrade to GitHub-native Dependabot
2021-04-29 15:06:22 +12:00
dependabot-preview[bot]
7be9e72d1e
Upgrade to GitHub-native Dependabot
2021-04-28 16:44:59 +00:00
dependabot-preview[bot]
787e0988c0
[Security] Bump oauth from 0.5.4 to 0.5.6
...
Bumps [oauth](https://github.com/oauth-xx/oauth-ruby ) from 0.5.4 to 0.5.6. **This update includes a security fix.**
- [Release notes](https://github.com/oauth-xx/oauth-ruby/releases )
- [Changelog](https://github.com/oauth-xx/oauth-ruby/blob/master/HISTORY )
- [Commits](https://github.com/oauth-xx/oauth-ruby/compare/v0.5.4...v0.5.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-28 06:35:46 +00:00
Daniel O'Connor
6e874e393a
Merge pull request #2806 from Growstuff/dependabot/bundler/oauth-0.5.6
...
Bump oauth from 0.5.4 to 0.5.6
2021-04-28 16:02:49 +09:30
dependabot-preview[bot]
36f207a000
Merge pull request #2801 from Growstuff/dependabot/bundler/chartkick-4.0.3
2021-04-28 06:31:59 +00:00
dependabot-preview[bot]
baf262d486
Bump chartkick from 4.0.2 to 4.0.3
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 4.0.2 to 4.0.3.
- [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/v4.0.2...v4.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-28 06:12:38 +00:00
dependabot-preview[bot]
0ece6b64d3
Merge pull request #2804 from Growstuff/dependabot/bundler/geocoder-1.6.7
2021-04-28 06:05:14 +00:00
dependabot-preview[bot]
12f20c69ec
Bump geocoder from 1.6.6 to 1.6.7
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.6.6 to 1.6.7.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.6...v1.6.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-28 05:48:08 +00:00
dependabot-preview[bot]
e16a81c980
Merge pull request #2803 from Growstuff/dependabot/bundler/oj-3.11.5
2021-04-28 05:42:06 +00:00
dependabot-preview[bot]
844f2bb34e
Bump oj from 3.11.3 to 3.11.5
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.3 to 3.11.5.
- [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.11.3...v3.11.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-28 05:19:51 +00:00
dependabot-preview[bot]
d64d9a52c0
Merge pull request #2805 from Growstuff/dependabot/bundler/faraday-1.4.1
2021-04-28 05:13:30 +00:00
dependabot[bot]
5b38b84bf1
Bump oauth from 0.5.4 to 0.5.6
...
Bumps [oauth](https://github.com/oauth-xx/oauth-ruby ) from 0.5.4 to 0.5.6.
- [Release notes](https://github.com/oauth-xx/oauth-ruby/releases )
- [Changelog](https://github.com/oauth-xx/oauth-ruby/blob/master/HISTORY )
- [Commits](https://github.com/oauth-xx/oauth-ruby/compare/v0.5.4...v0.5.6 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-04-22 16:33:24 +00:00
dependabot-preview[bot]
9282bb44b8
Bump faraday from 1.3.0 to 1.4.1
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v1.3.0...v1.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-19 08:43:52 +00:00
dependabot-preview[bot]
69c9c201dc
Merge pull request #2799 from Growstuff/dependabot/bundler/loofah-2.9.1
2021-04-09 00:52:33 +00:00
dependabot-preview[bot]
49eb688fa3
Bump loofah from 2.9.0 to 2.9.1
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.9.0...v2.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-09 00:32:42 +00:00
dependabot-preview[bot]
ced662349c
Merge pull request #2800 from Growstuff/dependabot/bundler/sidekiq-6.2.1
2021-04-09 00:30:35 +00:00
dependabot-preview[bot]
3532c6a040
Bump sidekiq from 6.2.0 to 6.2.1
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.2.0 to 6.2.1.
- [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.2.0...v6.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-08 08:56:25 +00:00
Daniel O'Connor
5ebe0de7d9
Merge pull request #2795 from Growstuff/dependabot/bundler/kramdown-2.3.1
...
Bump kramdown from 2.3.0 to 2.3.1
2021-04-08 15:14:34 +09:30
Daniel O'Connor
7336801744
Merge pull request #2784 from Growstuff/dependabot/bundler/puma-5.2.2
...
Bump puma from 5.2.1 to 5.2.2
2021-04-08 15:13:50 +09:30
dependabot-preview[bot]
aeb48252c9
Merge pull request #2798 from Growstuff/dependabot/bundler/chartkick-4.0.2
2021-04-08 05:43:33 +00:00
dependabot-preview[bot]
6dd105d269
Bump chartkick from 4.0.0 to 4.0.2
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 4.0.0 to 4.0.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/v4.0.0...v4.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-07 07:32:57 +00:00
dependabot[bot]
a4b21efeb6
Bump kramdown from 2.3.0 to 2.3.1
...
Bumps [kramdown](https://github.com/gettalong/kramdown ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases )
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page )
- [Commits](https://github.com/gettalong/kramdown/commits )
Signed-off-by: dependabot[bot] <support@github.com >
2021-04-07 05:23:47 +00:00
dependabot-preview[bot]
bef063fa34
Merge pull request #2785 from Growstuff/dependabot/bundler/geocoder-1.6.6
2021-04-07 05:20:20 +00:00
Daniel O'Connor
53c6a12b3d
Merge branch 'dev' into dependabot/bundler/puma-5.2.2
2021-04-07 14:37:22 +09:30
Daniel O'Connor
1332c84faf
Merge branch 'dev' into dependabot/bundler/geocoder-1.6.6
2021-04-07 14:31:04 +09:30
dependabot-preview[bot]
215376f93d
Merge pull request #2791 from Growstuff/dependabot/bundler/sidekiq-6.2.0
2021-04-07 05:00:32 +00:00
dependabot-preview[bot]
0dc6a8cf7d
Bump sidekiq from 6.1.3 to 6.2.0
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.1.3 to 6.2.0.
- [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.1.3...v6.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-06 01:02:28 +00:00
dependabot-preview[bot]
e06a5433f2
Bump geocoder from 1.6.5 to 1.6.6
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.6.5 to 1.6.6.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.5...v1.6.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-06 01:02:21 +00:00
dependabot-preview[bot]
49c219e5b3
Bump puma from 5.2.1 to 5.2.2
...
Bumps [puma](https://github.com/puma/puma ) from 5.2.1 to 5.2.2.
- [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.2.1...v5.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-06 01:02:18 +00:00
dependabot-preview[bot]
b8c1e8a023
Merge pull request #2792 from Growstuff/dependabot/bundler/unicorn-6.0.0
2021-04-06 01:00:11 +00:00
dependabot-preview[bot]
bb5b2335bd
Bump unicorn from 5.8.0 to 6.0.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.8.0 to 6.0.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-06 00:39:51 +00:00
dependabot-preview[bot]
0bf2b5bd79
Merge pull request #2793 from Growstuff/dependabot/bundler/rspec-rails-5.0.1
2021-04-06 00:37:34 +00:00
dependabot-preview[bot]
d46c6a3e0e
Bump rspec-rails from 4.0.2 to 5.0.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 4.0.2 to 5.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.2...v5.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-06 00:17:06 +00:00
dependabot-preview[bot]
f47844297d
Merge pull request #2789 from Growstuff/dependabot/bundler/faker-2.17.0
2021-04-06 00:14:06 +00:00
dependabot-preview[bot]
e0aa679b41
Bump faker from 2.16.0 to 2.17.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.16.0 to 2.17.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.16.0...v2.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-05 23:54:51 +00:00
dependabot-preview[bot]
f302ac5c66
Merge pull request #2796 from Growstuff/dependabot/bundler/listen-3.5.1
2021-04-05 23:52:15 +00:00
dependabot-preview[bot]
cae54c935d
Bump listen from 3.4.1 to 3.5.1
...
Bumps [listen](https://github.com/guard/listen ) from 3.4.1 to 3.5.1.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.4.1...v3.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-05 23:34:15 +00:00
dependabot-preview[bot]
8e20263fc9
Merge pull request #2788 from Growstuff/dependabot/bundler/oj-3.11.3
2021-04-05 23:31:23 +00:00
dependabot-preview[bot]
66d5571548
Bump oj from 3.11.2 to 3.11.3
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.2 to 3.11.3.
- [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.11.2...v3.11.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-05 23:11:30 +00:00
dependabot-preview[bot]
08983312d7
Merge pull request #2783 from Growstuff/dependabot/bundler/webdrivers-4.6.0
2021-04-05 23:08:29 +00:00
dependabot-preview[bot]
d1823b6fc6
Bump webdrivers from 4.5.0 to 4.6.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.5.0 to 4.6.0.
- [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.5.0...v4.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-05 22:47:18 +00:00
dependabot-preview[bot]
040e505a41
Merge pull request #2797 from Growstuff/dependabot/bundler/chartkick-4.0.0
2021-04-05 22:44:16 +00:00
dependabot-preview[bot]
9d4a9c605e
Bump chartkick from 3.4.2 to 4.0.0
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.4.2 to 4.0.0.
- [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.2...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-04-05 08:31:06 +00:00
dependabot-preview[bot]
5559a76d04
Merge pull request #2790 from Growstuff/dependabot/bundler/searchkick-4.4.4
2021-03-16 03:28:38 +00:00
dependabot-preview[bot]
a5c6b87f6b
Bump searchkick from 4.4.2 to 4.4.4
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.4.2 to 4.4.4.
- [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.4.2...v4.4.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-03-15 08:39:59 +00:00
dependabot-preview[bot]
d9351257e3
Merge pull request #2781 from Growstuff/dependabot/bundler/bullet-6.1.4
2021-02-28 03:04:48 +00:00
dependabot-preview[bot]
45dadf0780
Bump bullet from 6.1.3 to 6.1.4
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.3 to 6.1.4.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.3...6.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-26 09:30:32 +00:00
Brenda Wallace
135bfc783f
Merge pull request #2777 from Growstuff/dev
...
Production release
2021-02-17 21:04:22 +13:00
dependabot-preview[bot]
eb4161d421
Merge pull request #2773 from Growstuff/dependabot/bundler/rswag-ui-2.4.0
2021-02-15 10:23:20 +00:00
dependabot-preview[bot]
38fda111b3
Bump rswag-ui from 2.3.2 to 2.4.0
...
Bumps [rswag-ui](https://github.com/rswag/rswag ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.3.2...2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 10:03:30 +00:00
dependabot-preview[bot]
288068bfb1
Merge pull request #2779 from Growstuff/dependabot/bundler/elasticsearch-6.8.3
2021-02-15 10:00:37 +00:00
dependabot-preview[bot]
16648e8521
Bump elasticsearch from 6.8.2 to 6.8.3
...
Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby ) from 6.8.2 to 6.8.3.
- [Release notes](https://github.com/elastic/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/elastic/elasticsearch-ruby/compare/v6.8.2...v6.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 09:40:05 +00:00
dependabot-preview[bot]
2c38957347
Merge pull request #2772 from Growstuff/dependabot/bundler/rswag-api-2.4.0
2021-02-15 09:37:52 +00:00
dependabot-preview[bot]
37a3fd3df8
Bump rswag-api from 2.3.2 to 2.4.0
...
Bumps [rswag-api](https://github.com/rswag/rswag ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.3.2...2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 09:21:20 +00:00
dependabot-preview[bot]
d402a823d2
Merge pull request #2780 from Growstuff/dependabot/bundler/geocoder-1.6.5
2021-02-15 09:19:04 +00:00
dependabot-preview[bot]
d7d624cf9d
Bump geocoder from 1.6.4 to 1.6.5
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.6.4 to 1.6.5.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.4...v1.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 09:00:08 +00:00
dependabot-preview[bot]
bc52d7635d
Merge pull request #2778 from Growstuff/dependabot/bundler/scout_apm-4.0.4
2021-02-15 08:58:11 +00:00
dependabot-preview[bot]
129d10ec38
Bump scout_apm from 4.0.3 to 4.0.4
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 4.0.3 to 4.0.4.
- [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/v4.0.3...v4.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 08:37:53 +00:00
dependabot-preview[bot]
65e026352f
Merge pull request #2764 from Growstuff/dependabot/bundler/xmlrpc-0.3.2
2021-02-15 08:35:17 +00:00
dependabot-preview[bot]
bd5554fda7
Bump xmlrpc from 0.3.1 to 0.3.2
...
Bumps [xmlrpc](https://github.com/ruby/xmlrpc ) from 0.3.1 to 0.3.2.
- [Release notes](https://github.com/ruby/xmlrpc/releases )
- [Changelog](https://github.com/ruby/xmlrpc/blob/master/NEWS.md )
- [Commits](https://github.com/ruby/xmlrpc/compare/v0.3.1...v0.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 08:14:20 +00:00
dependabot-preview[bot]
61ed27e16d
Merge pull request #2774 from Growstuff/dependabot/bundler/faker-2.16.0
2021-02-15 08:12:16 +00:00
dependabot-preview[bot]
aff4a1ae54
Bump faker from 2.15.1 to 2.16.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.15.1 to 2.16.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.15.1...v2.16.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 07:54:18 +00:00
dependabot-preview[bot]
da2330fdcf
Merge pull request #2763 from Growstuff/dependabot/bundler/database_cleaner-2.0.1
2021-02-15 07:52:16 +00:00
dependabot-preview[bot]
f480642bbd
Bump database_cleaner from 2.0.0 to 2.0.1
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v2.0.0...v2.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 07:33:46 +00:00
dependabot-preview[bot]
4ef54f1546
Merge pull request #2767 from Growstuff/dependabot/bundler/jsonapi-resources-0.10.4
2021-02-15 07:25:55 +00:00
dependabot-preview[bot]
8c6cf474d6
Bump jsonapi-resources from 0.10.3 to 0.10.4
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.10.3 to 0.10.4.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.10.3...v0.10.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 07:08:10 +00:00
dependabot-preview[bot]
5f66d66930
Merge pull request #2766 from Growstuff/dependabot/bundler/puma-5.2.1
2021-02-15 07:04:37 +00:00
dependabot-preview[bot]
6f4cdb858b
Bump puma from 5.1.1 to 5.2.1
...
Bumps [puma](https://github.com/puma/puma ) from 5.1.1 to 5.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/v5.1.1...v5.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 06:47:10 +00:00
dependabot-preview[bot]
7c3fc63fb3
Merge pull request #2753 from Growstuff/dependabot/bundler/bootstrap-4.6.0
2021-02-15 06:44:28 +00:00
dependabot-preview[bot]
6176b05ecc
Bump bootstrap from 4.5.3 to 4.6.0
...
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.5.3 to 4.6.0.
- [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.3...v4.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 06:25:00 +00:00
Brenda Wallace
0e8ec9496f
Merge branch 'mainline' into dev
2021-02-15 19:21:44 +13:00
dependabot-preview[bot]
3dc3ce9079
Merge pull request #2775 from Growstuff/dependabot/bundler/timecop-0.9.4
2021-02-15 06:10:44 +00:00
dependabot-preview[bot]
c3f194ee65
Bump timecop from 0.9.2 to 0.9.4
...
Bumps [timecop](https://github.com/travisjeffery/timecop ) from 0.9.2 to 0.9.4.
- [Release notes](https://github.com/travisjeffery/timecop/releases )
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md )
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.2...v0.9.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-15 05:52:16 +00:00
dependabot-preview[bot]
84a0fe66df
Merge pull request #2776 from Growstuff/dependabot/bundler/rswag-specs-2.4.0
2021-02-15 05:48:35 +00:00
dependabot-preview[bot]
3812915628
Bump rswag-specs from 2.3.2 to 2.4.0
...
Bumps [rswag-specs](https://github.com/rswag/rswag ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.3.2...2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-10 07:27:48 +00:00
dependabot-preview[bot]
aad10ed24c
Merge pull request #2771 from Growstuff/dependabot/bundler/carrierwave-2.1.1
2021-02-08 22:52:37 +00:00
dependabot-preview[bot]
66e65fd9e6
[Security] Bump carrierwave from 2.1.0 to 2.1.1
...
Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave ) from 2.1.0 to 2.1.1. **This update includes security fixes.**
- [Release notes](https://github.com/carrierwaveuploader/carrierwave/releases )
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md )
- [Commits](https://github.com/carrierwaveuploader/carrierwave/compare/v2.1.0...v2.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-08 19:48:30 +00:00
dependabot-preview[bot]
b4c971fbef
Merge pull request #2758 from Growstuff/dependabot/bundler/oj-3.11.2
2021-02-04 00:54:08 +00:00
dependabot-preview[bot]
fef770802e
Bump oj from 3.11.1 to 3.11.2
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.1 to 3.11.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.11.1...v3.11.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-01 21:17:42 +00:00
dependabot-preview[bot]
b104e05585
Merge pull request #2756 from Growstuff/dependabot/bundler/rswag-specs-2.3.2
2021-02-01 21:15:26 +00:00
dependabot-preview[bot]
fa1ac30678
Bump rswag-specs from 2.3.1 to 2.3.2
...
Bumps [rswag-specs](https://github.com/rswag/rswag ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.3.1...2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-01 20:54:04 +00:00
dependabot-preview[bot]
e525cdcbae
Merge pull request #2761 from Growstuff/dependabot/bundler/capybara-3.35.3
2021-02-01 20:52:07 +00:00
dependabot-preview[bot]
1026175a40
Bump capybara from 3.34.0 to 3.35.3
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.34.0 to 3.35.3.
- [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.34.0...3.35.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-01 20:29:17 +00:00
dependabot-preview[bot]
2d73878a84
Merge pull request #2762 from Growstuff/dependabot/bundler/database_cleaner-2.0.0
2021-02-01 20:27:21 +00:00
dependabot-preview[bot]
e615882d53
Bump database_cleaner from 1.8.5 to 2.0.0
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.5 to 2.0.0.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.5...v2.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-02-01 09:04:15 +00:00
dependabot-preview[bot]
53b921ba9a
Merge pull request #2760 from Growstuff/dependabot/bundler/jsonapi-resources-0.10.3
2021-01-31 20:33:51 +00:00
dependabot-preview[bot]
3c6e47cfd4
Bump jsonapi-resources from 0.10.2 to 0.10.3
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.10.2 to 0.10.3.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.10.2...v0.10.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-29 07:19:37 +00:00
dependabot-preview[bot]
bd7561987f
Merge pull request #2757 from Growstuff/dependabot/bundler/rswag-ui-2.3.2
2021-01-29 06:39:21 +00:00
dependabot-preview[bot]
26eca986df
Bump rswag-ui from 2.3.1 to 2.3.2
...
Bumps [rswag-ui](https://github.com/rswag/rswag ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.3.1...2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-29 06:22:43 +00:00
dependabot-preview[bot]
8f057b4790
Merge pull request #2759 from Growstuff/dependabot/bundler/rswag-api-2.3.2
2021-01-29 06:20:20 +00:00
dependabot-preview[bot]
a350b6877b
Bump rswag-api from 2.3.1 to 2.3.2
...
Bumps [rswag-api](https://github.com/rswag/rswag ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.3.1...2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-28 07:26:06 +00:00
Brenda Wallace
77e1c435f3
Merge pull request #2754 from Growstuff/dev
...
production deploy
2021-01-27 22:39:35 +13:00
Brenda Wallace
a79c5b87c5
Merge remote-tracking branch 'upstream/dev' into dev
2021-01-27 22:38:54 +13:00
dependabot-preview[bot]
592ab36187
Merge pull request #2738 from Growstuff/dependabot/bundler/webdrivers-4.5.0
2021-01-26 19:38:10 +00:00
dependabot-preview[bot]
e971625fbe
Bump webdrivers from 4.4.2 to 4.5.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.4.2 to 4.5.0.
- [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.4.2...v4.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-26 19:15:41 +00:00
dependabot-preview[bot]
b0e1359f3b
Merge pull request #2737 from Growstuff/dependabot/bundler/scout_apm-4.0.3
2021-01-26 19:13:46 +00:00
dependabot-preview[bot]
b7a1127a23
Bump scout_apm from 4.0.2 to 4.0.3
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 4.0.2 to 4.0.3.
- [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/v4.0.2...v4.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-26 18:52:43 +00:00
Brenda Wallace
60c56d1458
Nice formatting on crop descriptions
2021-01-27 07:50:19 +13:00
Brenda Wallace
108a2052ca
protect against not finding a crop
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
8b1fb4d73e
Bump oj from 3.11.0 to 3.11.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.0 to 3.11.1.
- [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.11.0...v3.11.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
e5ce52083c
Bump bullet from 6.1.2 to 6.1.3
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.2...6.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
e861ed8ac0
Bump sidekiq from 6.1.2 to 6.1.3
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.1.2 to 6.1.3.
- [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.1.2...v6.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
5061167df9
Bump scout_apm from 4.0.1 to 4.0.2
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 4.0.1 to 4.0.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/v4.0.1...v4.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
8e0e3b8fc4
Bump scout_apm from 4.0.0 to 4.0.1
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 4.0.0 to 4.0.1.
- [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/v4.0.0...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
a3da140a19
Bump loofah from 2.8.0 to 2.9.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.8.0 to 2.9.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.8.0...v2.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-27 07:50:19 +13:00
Brenda Wallace
40afe90b14
Nice formatting on crop descriptions
2021-01-26 15:57:43 +13:00
Brenda Wallace
5ea7c44614
protect against not finding a crop
2021-01-26 10:09:04 +13:00
dependabot-preview[bot]
cd09dd4a52
Merge pull request #2748 from Growstuff/dependabot/bundler/oj-3.11.1
2021-01-25 21:08:21 +00:00
dependabot-preview[bot]
c763f59651
Bump oj from 3.11.0 to 3.11.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.0 to 3.11.1.
- [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.11.0...v3.11.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-25 07:57:31 +00:00
dependabot-preview[bot]
288a550c12
Merge pull request #2739 from Growstuff/dependabot/bundler/bullet-6.1.3
2021-01-23 02:50:51 +00:00
dependabot-preview[bot]
ac9be97053
Bump bullet from 6.1.2 to 6.1.3
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.2...6.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-23 02:32:00 +00:00
dependabot-preview[bot]
53a59d10b6
Merge pull request #2740 from Growstuff/dependabot/bundler/sidekiq-6.1.3
2021-01-23 02:30:08 +00:00
dependabot-preview[bot]
b914eb780c
Bump sidekiq from 6.1.2 to 6.1.3
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.1.2 to 6.1.3.
- [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.1.2...v6.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-22 07:17:01 +00:00
dependabot-preview[bot]
08882efeda
Merge pull request #2736 from Growstuff/dependabot/bundler/scout_apm-4.0.2
2021-01-21 02:56:33 +00:00
dependabot-preview[bot]
28b35ca9ba
Bump scout_apm from 4.0.1 to 4.0.2
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 4.0.1 to 4.0.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/v4.0.1...v4.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-20 08:51:16 +00:00
dependabot-preview[bot]
a69dee51db
Merge pull request #2735 from Growstuff/dependabot/bundler/scout_apm-4.0.1
2021-01-19 20:58:00 +00:00
dependabot-preview[bot]
5a88b3affa
Bump scout_apm from 4.0.0 to 4.0.1
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 4.0.0 to 4.0.1.
- [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/v4.0.0...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-19 20:38:34 +00:00
dependabot-preview[bot]
d5fefe61bb
Bump loofah from 2.8.0 to 2.9.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.8.0 to 2.9.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.8.0...v2.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-20 09:35:49 +13:00
Brenda Wallace
dde0c04f2f
Merge pull request #2734 from Growstuff/dev
...
production deploy
2021-01-20 09:33:47 +13:00
dependabot-preview[bot]
b116f4a259
Merge pull request #2730 from Growstuff/dependabot/bundler/oj-3.11.0
2021-01-18 03:38:18 +00:00
dependabot-preview[bot]
e9c1c6f1f6
Bump oj from 3.10.18 to 3.11.0
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.18 to 3.11.0.
- [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.18...v3.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-18 03:18:42 +00:00
dependabot-preview[bot]
a8d5ed23ba
Merge pull request #2731 from Growstuff/dependabot/bundler/listen-3.4.1
2021-01-18 03:16:49 +00:00
dependabot-preview[bot]
c719935eda
Bump listen from 3.4.0 to 3.4.1
...
Bumps [listen](https://github.com/guard/listen ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.4.0...v3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-18 02:56:05 +00:00
Brenda Wallace
912c5bdd4b
Merge remote-tracking branch 'upstream/mainline' into dev
2021-01-18 15:54:06 +13:00
dependabot-preview[bot]
88ba4dfb2c
Merge pull request #2733 from Growstuff/dependabot/bundler/platform-api-3.3.0
2021-01-18 02:49:22 +00:00
dependabot-preview[bot]
eab34c5177
Bump platform-api from 3.2.0 to 3.3.0
...
Bumps [platform-api](https://github.com/heroku/platform-api ) from 3.2.0 to 3.3.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.2.0...v3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-15 07:57:44 +00:00
dependabot-preview[bot]
3598e594a4
Merge pull request #2729 from Growstuff/dependabot/bundler/haml_lint-0.37.0
2021-01-10 21:31:17 +00:00
dependabot-preview[bot]
18136aa276
Bump haml_lint from 0.36.0 to 0.37.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.36.0 to 0.37.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.36.0...v0.37.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-08 08:15:36 +00:00
dependabot-preview[bot]
312c183eaf
Bump friendly_id from 5.4.1 to 5.4.2
...
Bumps [friendly_id](https://github.com/norman/friendly_id ) from 5.4.1 to 5.4.2.
- [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.1...5.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-07 22:53:48 +13:00
Brenda Wallace
f6e5e27dd3
Update README.md
2021-01-06 11:40:09 +13:00
Brenda Wallace
4d3fcc8497
Upgrade ruby to 2.7.2
2021-01-06 11:39:03 +13:00
dependabot-preview[bot]
b1332ee2c0
Merge pull request #2725 from Growstuff/dependabot/bundler/listen-3.4.0
2021-01-05 10:36:08 +00:00
dependabot-preview[bot]
c24343c051
Bump listen from 3.3.3 to 3.4.0
...
Bumps [listen](https://github.com/guard/listen ) from 3.3.3 to 3.4.0.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.3.3...v3.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 10:18:06 +00:00
dependabot-preview[bot]
d618c240dd
Merge pull request #2723 from Growstuff/dependabot/bundler/js-routes-1.4.14
2021-01-05 10:15:53 +00:00
dependabot-preview[bot]
7c38a238cf
Bump js-routes from 1.4.13 to 1.4.14
...
Bumps [js-routes](https://github.com/railsware/js-routes ) from 1.4.13 to 1.4.14.
- [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.13...v1.4.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 09:58:28 +00:00
dependabot-preview[bot]
69802447de
Merge pull request #2724 from Growstuff/dependabot/bundler/ruby-units-2.3.2
2021-01-05 09:56:38 +00:00
dependabot-preview[bot]
44dfdd0e8f
Bump ruby-units from 2.3.1 to 2.3.2
...
Bumps [ruby-units](https://github.com/olbrich/ruby-units ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/olbrich/ruby-units/releases )
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt )
- [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.1...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 09:38:48 +00:00
dependabot-preview[bot]
98be383fd9
Bump webdrivers from 4.4.1 to 4.4.2
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.4.1 to 4.4.2.
- [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.4.1...v4.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 22:36:19 +13:00
Brenda Wallace
65eedef3df
add back the name of item we're linking to when adding a photo
2021-01-05 19:46:07 +13:00
Brenda Wallace
c733bb463c
add flickr keys to ci
2021-01-05 19:46:07 +13:00
codefactor-io
84d02b169a
[CodeFactor] Apply fixes
2021-01-05 19:46:07 +13:00
Brenda Wallace
60c74ddff3
Reconnecting stale flickr auth tokens
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
32414cb409
Bump faraday from 1.1.0 to 1.3.0
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.1.0 to 1.3.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.1.0...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
62a9205559
Bump js-routes from 1.4.11 to 1.4.13
...
Bumps [js-routes](https://github.com/railsware/js-routes ) from 1.4.11 to 1.4.13.
- [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.11...v1.4.13 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
0421782c3e
Bump cancancan from 3.1.0 to 3.2.1
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.1.0 to 3.2.1.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.1.0...3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
aca4052c2d
Bump rake from 13.0.1 to 13.0.3
...
Bumps [rake](https://github.com/ruby/rake ) from 13.0.1 to 13.0.3.
- [Release notes](https://github.com/ruby/rake/releases )
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc )
- [Commits](https://github.com/ruby/rake/compare/v13.0.1...v13.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
a057a4235f
Bump rspec-rails from 4.0.1 to 4.0.2
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
1167189a97
Bump rubocop-rails from 2.9.0 to 2.9.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.9.0...v2.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
f9d9b94db7
Bump unicorn from 5.7.0 to 5.8.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.7.0 to 5.8.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c27af9e7c6
[Security] Bump nokogiri from 1.10.10 to 1.11.0
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.10 to 1.11.0. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.10...v1.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
Brenda Wallace
42116db99e
break out steps of setup
2021-01-05 19:46:07 +13:00
Brenda Wallace
784bf66216
use codeclimate from gem
2021-01-05 19:46:07 +13:00
Brenda Wallace
0cb7c76c76
use apt-get instead of apt
2021-01-05 19:46:07 +13:00
Brenda Wallace
f0b931b3cd
Remove duplicate env var
2021-01-05 19:46:07 +13:00
Brenda Wallace
4f70156d4c
install chrome in gh workflow
2021-01-05 19:46:07 +13:00
Brenda Wallace
ce88f6e43e
Move env variable to on place in gh workflow config
2021-01-05 19:46:07 +13:00
Brenda Wallace
9e26b3b51a
remove reference to coveralls
2021-01-05 19:46:07 +13:00
Brenda Wallace
0d33960e1d
Rename ci step to "start elasticsearch"
2021-01-05 19:46:07 +13:00
Brenda Wallace
398531ba70
Removing coveralls
2021-01-05 19:46:07 +13:00
Brenda Wallace
d3e05d6a48
Only run travis on deploy
2021-01-05 19:46:07 +13:00
Brenda Wallace
bd62b7bd5d
adding RAILS_SECRET_TOKEN: supersecret
2021-01-05 19:46:07 +13:00
Brenda Wallace
39f244f3be
devise secrets needs to match
2021-01-05 19:46:07 +13:00
Brenda Wallace
9d77d5362d
Set elasticsearch to 7.5.1
2021-01-05 19:46:07 +13:00
Brenda Wallace
528cc5c1b3
Add elastic search
2021-01-05 19:46:07 +13:00
Brenda Wallace
2b843ceaca
Only run on pull requests
2021-01-05 19:46:07 +13:00
Brenda Wallace
e276efe1f0
Run the rspec on github
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c8bff44978
Bump puma from 5.1.0 to 5.1.1
...
Bumps [puma](https://github.com/puma/puma ) from 5.1.0 to 5.1.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/v5.1.0...v5.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
b5a73aa078
Bump bullet from 6.1.0 to 6.1.2
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.0 to 6.1.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.0...6.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c783218c9a
Bump oj from 3.10.16 to 3.10.18
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.16 to 3.10.18.
- [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.16...v3.10.18 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
69cd116698
Bump listen from 3.3.1 to 3.3.3
...
Bumps [listen](https://github.com/guard/listen ) from 3.3.1 to 3.3.3.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.3.1...v3.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
Brenda Wallace
03d807cc45
Create brakeman-analysis.yml
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c798389f37
Bump rubocop-rails from 2.8.1 to 2.9.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.8.1 to 2.9.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.1...v2.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
03cec2fa84
Bump puma from 5.0.4 to 5.1.0
...
Bumps [puma](https://github.com/puma/puma ) from 5.0.4 to 5.1.0.
- [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.4...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c765c83fec
Bump scout_apm from 2.6.10 to 4.0.0
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.10 to 4.0.0.
- [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.10...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
358abfcb05
Bump haml from 5.2.0 to 5.2.1
...
Bumps [haml](https://github.com/haml/haml ) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/v5.2.0...5.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
579c65cc97
Bump faker from 2.14.0 to 2.15.1
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.14.0 to 2.15.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.14.0...v2.15.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
f81ba493cd
Bump searchkick from 4.4.1 to 4.4.2
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.4.1 to 4.4.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.4.1...v4.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
f3eb6433d1
Bump loofah from 2.7.0 to 2.8.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.7.0 to 2.8.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.7.0...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c491ae7a2d
Bump jsonapi-swagger from 0.8.0 to 0.8.1
...
Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger ) from 0.8.0 to 0.8.1.
- [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases )
- [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.8.0...v0.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
e1495b629c
Bump xmlrpc from 0.3.0 to 0.3.1
...
Bumps [xmlrpc](https://github.com/ruby/xmlrpc ) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/ruby/xmlrpc/releases )
- [Changelog](https://github.com/ruby/xmlrpc/blob/master/NEWS.md )
- [Commits](https://github.com/ruby/xmlrpc/compare/v0.3.0...v0.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
fd07ef4080
Bump capybara from 3.33.0 to 3.34.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.33.0 to 3.34.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.33.0...3.34.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
997686599e
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 >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
976a66896d
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 >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
95839105d8
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 >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
812ae0980f
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 >
2021-01-05 19:46:07 +13:00
Brenda Wallace
43a577fa50
Update rubocop config
2021-01-05 19:46:07 +13:00
Brenda Wallace
26f1991d16
Adding back the TODO detector, haml, and node security
2021-01-05 19:46:07 +13:00
Brenda Wallace
acf9f48478
Update rubocop
2021-01-05 19:46:07 +13:00
Brenda Wallace
4c6b37ee52
New codeclimate config syntax
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
ef4ebdafd3
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 >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
0500ec4978
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 >
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
04b4d9727f
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 >
2021-01-05 19:46:07 +13:00
Brenda Wallace
27f95359c3
Merge branch 'mainline' into dev
2021-01-05 19:29:43 +13:00
Brenda Wallace
9d6d9b9647
add back the name of item we're linking to when adding a photo
2021-01-05 17:15:58 +13:00
Brenda Wallace
eb86325246
add flickr keys to ci
2021-01-05 17:15:58 +13:00
codefactor-io
998f1fc5ac
[CodeFactor] Apply fixes
2021-01-05 17:15:58 +13:00
Brenda Wallace
f90be934a7
Reconnecting stale flickr auth tokens
2021-01-05 17:15:58 +13:00
dependabot-preview[bot]
95da3dc425
Merge pull request #2716 from Growstuff/dependabot/bundler/faraday-1.3.0
2021-01-04 14:08:28 +00:00
dependabot-preview[bot]
fab71d5d1c
Bump faraday from 1.1.0 to 1.3.0
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 1.1.0 to 1.3.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.1.0...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-04 13:49:00 +00:00
dependabot-preview[bot]
fe2b653ab5
Merge pull request #2704 from Growstuff/dependabot/bundler/js-routes-1.4.13
2021-01-04 13:47:05 +00:00
dependabot-preview[bot]
21a59c1d58
Bump js-routes from 1.4.11 to 1.4.13
...
Bumps [js-routes](https://github.com/railsware/js-routes ) from 1.4.11 to 1.4.13.
- [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.11...v1.4.13 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-04 13:30:39 +00:00
dependabot-preview[bot]
7ac44a506c
Merge pull request #2715 from Growstuff/dependabot/bundler/cancancan-3.2.1
2021-01-04 13:25:04 +00:00
dependabot-preview[bot]
e6d5bbe219
Bump cancancan from 3.1.0 to 3.2.1
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.1.0 to 3.2.1.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.1.0...3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-04 13:08:12 +00:00
dependabot-preview[bot]
241cbc67a3
Merge pull request #2710 from Growstuff/dependabot/bundler/rake-13.0.3
2021-01-04 13:06:26 +00:00
dependabot-preview[bot]
2267a63e18
Bump rake from 13.0.1 to 13.0.3
...
Bumps [rake](https://github.com/ruby/rake ) from 13.0.1 to 13.0.3.
- [Release notes](https://github.com/ruby/rake/releases )
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc )
- [Commits](https://github.com/ruby/rake/compare/v13.0.1...v13.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-04 12:49:01 +00:00
dependabot-preview[bot]
fb96558443
Merge pull request #2714 from Growstuff/dependabot/bundler/rspec-rails-4.0.2
2021-01-04 12:47:20 +00:00
dependabot-preview[bot]
22297c76f6
Bump rspec-rails from 4.0.1 to 4.0.2
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-04 12:28:56 +00:00
dependabot-preview[bot]
130416e0c1
Merge pull request #2709 from Growstuff/dependabot/bundler/rubocop-rails-2.9.1
2021-01-04 12:26:16 +00:00
dependabot-preview[bot]
5d93b5af7d
Bump rubocop-rails from 2.9.0 to 2.9.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.9.0...v2.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-04 12:06:50 +00:00
dependabot-preview[bot]
ca6577233e
Merge pull request #2712 from Growstuff/dependabot/bundler/unicorn-5.8.0
2021-01-04 12:04:44 +00:00
dependabot-preview[bot]
1daf11d623
Bump unicorn from 5.7.0 to 5.8.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.7.0 to 5.8.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-04 11:47:44 +00:00
dependabot-preview[bot]
8d14eb1c49
[Security] Bump nokogiri from 1.10.10 to 1.11.0
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.10 to 1.11.0. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.10...v1.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-05 00:44:51 +13:00
Brenda Wallace
147eba83d1
break out steps of setup
2021-01-04 23:04:58 +13:00
Brenda Wallace
fb9c42aaf5
use codeclimate from gem
2021-01-04 23:04:58 +13:00
Brenda Wallace
441831f9a5
use apt-get instead of apt
2021-01-04 23:04:58 +13:00
Brenda Wallace
a2b2ac99a5
Remove duplicate env var
2021-01-04 23:04:58 +13:00
Brenda Wallace
1f9de77648
install chrome in gh workflow
2021-01-04 23:04:58 +13:00
Brenda Wallace
e8db5ad142
Move env variable to on place in gh workflow config
2021-01-04 23:04:58 +13:00
Brenda Wallace
e2c0418ab8
remove reference to coveralls
2021-01-04 23:04:58 +13:00
Brenda Wallace
55f36885a6
Rename ci step to "start elasticsearch"
2021-01-04 23:04:58 +13:00
Brenda Wallace
b2f06b7a47
Removing coveralls
2021-01-04 23:04:58 +13:00
Brenda Wallace
df8fade89d
Only run travis on deploy
2021-01-04 23:04:58 +13:00
Brenda Wallace
6229c41aa5
adding RAILS_SECRET_TOKEN: supersecret
2021-01-04 23:04:58 +13:00
Brenda Wallace
d79dbf09b5
devise secrets needs to match
2021-01-04 23:04:58 +13:00
Brenda Wallace
fae8026d11
Set elasticsearch to 7.5.1
2021-01-04 23:04:58 +13:00
Brenda Wallace
af11977188
Add elastic search
2021-01-04 23:04:58 +13:00
Brenda Wallace
6e09095182
Only run on pull requests
2021-01-04 23:04:58 +13:00
Brenda Wallace
a0914ac89b
Run the rspec on github
2021-01-04 23:04:58 +13:00
dependabot-preview[bot]
cb9f101652
Merge pull request #2705 from Growstuff/dependabot/bundler/puma-5.1.1
2021-01-04 09:56:20 +00:00
dependabot-preview[bot]
05e72df177
Bump puma from 5.1.0 to 5.1.1
...
Bumps [puma](https://github.com/puma/puma ) from 5.1.0 to 5.1.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/v5.1.0...v5.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-04 09:23:21 +00:00
dependabot-preview[bot]
73bd7f3a15
Merge pull request #2707 from Growstuff/dependabot/bundler/bullet-6.1.2
2021-01-04 09:20:42 +00:00
dependabot-preview[bot]
acaa2e385f
Bump bullet from 6.1.0 to 6.1.2
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.0 to 6.1.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.0...6.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2021-01-04 08:58:44 +00:00
dependabot-preview[bot]
5bfaa766fb
Merge pull request #2713 from Growstuff/dependabot/bundler/oj-3.10.18
2021-01-04 08:56:03 +00:00
dependabot-preview[bot]
e947cbb87d
Bump oj from 3.10.16 to 3.10.18
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.16 to 3.10.18.
- [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.16...v3.10.18 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-28 07:39:19 +00:00
dependabot-preview[bot]
a64994c58c
Bump listen from 3.3.1 to 3.3.3
...
Bumps [listen](https://github.com/guard/listen ) from 3.3.1 to 3.3.3.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.3.1...v3.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-22 11:38:00 +13:00
Brenda Wallace
194f360ddb
Create brakeman-analysis.yml
2020-12-10 12:53:34 +13:00
dependabot-preview[bot]
77afb28b2f
Bump rubocop-rails from 2.8.1 to 2.9.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.8.1 to 2.9.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.1...v2.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-10 12:49:59 +13:00
dependabot-preview[bot]
c26c159c73
Bump puma from 5.0.4 to 5.1.0
...
Bumps [puma](https://github.com/puma/puma ) from 5.0.4 to 5.1.0.
- [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.4...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-06 10:48:56 +13:00
dependabot-preview[bot]
1305138cec
Bump scout_apm from 2.6.10 to 4.0.0
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.10 to 4.0.0.
- [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.10...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-05 14:45:16 +13:00
Brenda Wallace
b018553059
Merge pull request #2700 from Growstuff/dependabot/bundler/haml-5.2.1
...
Bump haml from 5.2.0 to 5.2.1
2020-12-03 14:08:32 +13:00
dependabot-preview[bot]
61eb20bab2
Bump haml from 5.2.0 to 5.2.1
...
Bumps [haml](https://github.com/haml/haml ) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/v5.2.0...5.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-01 08:17:46 +00:00
Brenda Wallace
76b3e69888
Merge pull request #2694 from Growstuff/dependabot/bundler/faker-2.15.1
...
Bump faker from 2.14.0 to 2.15.1
2020-12-01 18:24:52 +13:00
dependabot-preview[bot]
b7d34528e6
Bump faker from 2.14.0 to 2.15.1
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.14.0 to 2.15.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.14.0...v2.15.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-30 10:00:55 +00:00
dependabot-preview[bot]
2aeab89e94
Merge pull request #2693 from Growstuff/dependabot/bundler/searchkick-4.4.2
2020-11-30 09:58:48 +00:00
dependabot-preview[bot]
7d7e9d7d0f
Bump searchkick from 4.4.1 to 4.4.2
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.4.1 to 4.4.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.4.1...v4.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-30 08:34:16 +00:00
dependabot-preview[bot]
5e6f373234
Merge pull request #2696 from Growstuff/dependabot/bundler/loofah-2.8.0
2020-11-30 08:31:51 +00:00
dependabot-preview[bot]
522ff9a29d
Bump loofah from 2.7.0 to 2.8.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.7.0 to 2.8.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.7.0...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-30 08:05:07 +00:00
dependabot-preview[bot]
9ef116df87
Merge pull request #2692 from Growstuff/dependabot/bundler/jsonapi-swagger-0.8.1
2020-11-30 08:02:54 +00:00
dependabot-preview[bot]
5ab2891a13
Bump jsonapi-swagger from 0.8.0 to 0.8.1
...
Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger ) from 0.8.0 to 0.8.1.
- [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases )
- [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.8.0...v0.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-30 07:17:20 +00:00
dependabot-preview[bot]
3c668ee30f
Merge pull request #2691 from Growstuff/dependabot/bundler/xmlrpc-0.3.1
2020-11-30 07:14:30 +00:00
dependabot-preview[bot]
820dd45de3
Bump xmlrpc from 0.3.0 to 0.3.1
...
Bumps [xmlrpc](https://github.com/ruby/xmlrpc ) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/ruby/xmlrpc/releases )
- [Changelog](https://github.com/ruby/xmlrpc/blob/master/NEWS.md )
- [Commits](https://github.com/ruby/xmlrpc/compare/v0.3.0...v0.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-30 06:50:42 +00:00
dependabot-preview[bot]
1487d5671a
Merge pull request #2697 from Growstuff/dependabot/bundler/capybara-3.34.0
2020-11-30 06:48:14 +00:00
dependabot-preview[bot]
d240f49d77
Bump capybara from 3.33.0 to 3.34.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.33.0 to 3.34.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.33.0...3.34.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-27 07:13:39 +00:00
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
Brenda Wallace
67b79fc832
Merge pull request #2680 from Growstuff/dev
...
Production release
2020-11-03 15:36:21 +13: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
dependabot-preview[bot]
f9cbabb35f
Bump timecop from 0.9.1 to 0.9.2
...
Bumps [timecop](https://github.com/travisjeffery/timecop ) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/travisjeffery/timecop/releases )
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md )
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.1...v0.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
ad2acd46d4
Bump rubocop from 0.93.0 to 0.93.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.93.0 to 0.93.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.93.0...v0.93.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
4ec7134fdf
Bump geocoder from 1.6.3 to 1.6.4
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.6.3 to 1.6.4.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.3...v1.6.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
d52f4c0afa
Bump rubocop from 0.92.0 to 0.93.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.92.0 to 0.93.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.92.0...v0.93.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
f7cf49bdcd
Bump haml from 5.1.2 to 5.2.0
...
Bumps [haml](https://github.com/haml/haml ) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/v5.1.2...v5.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
4e1711849e
Bump better_errors from 2.8.2 to 2.8.3
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.2...v2.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
9f43a18600
Bump chartkick from 3.4.0 to 3.4.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.4.0 to 3.4.1.
- [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.0...v3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
7f515c58f8
Bump dalli from 2.7.10 to 2.7.11
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.10 to 2.7.11.
- [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.10...v2.7.11 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
4960b33ed2
Bump faker from 2.13.0 to 2.14.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.13.0 to 2.14.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.13.0...v2.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
f5217b0709
Bump validate_url from 1.0.11 to 1.0.13
...
Bumps [validate_url](https://github.com/perfectline/validates_url ) from 1.0.11 to 1.0.13.
- [Release notes](https://github.com/perfectline/validates_url/releases )
- [Commits](https://github.com/perfectline/validates_url/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
010bd4553a
Bump rubocop from 0.91.0 to 0.92.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.91.0 to 0.92.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.91.0...v0.92.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
7c3d8de35a
Bump puma from 4.3.6 to 5.0.2
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.6 to 5.0.2.
- [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.3.6...v5.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
b49fddefd1
Bump better_errors from 2.7.1 to 2.8.2
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.7.1 to 2.8.2.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
5b2b5f2af4
Bump haml_lint from 0.35.0 to 0.36.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.35.0 to 0.36.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.35.0...v0.36.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
0f2f3ac51e
Bump devise from 4.7.2 to 4.7.3
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.2 to 4.7.3.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.2...v4.7.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
8508d21585
Bump query_diet from 0.6.2 to 0.7.0
...
Bumps [query_diet](https://github.com/makandra/query_diet ) from 0.6.2 to 0.7.0.
- [Release notes](https://github.com/makandra/query_diet/releases )
- [Changelog](https://github.com/makandra/query_diet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/makandra/query_diet/compare/v0.6.2...v0.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
bb23534b97
Bump rubocop-rails from 2.8.0 to 2.8.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.0...v2.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
Brenda Wallace
452f58ccf6
bump codeclimate to rubocop 0.91
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
28a117dad6
Bump rubocop from 0.90.0 to 0.91.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.90.0 to 0.91.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.90.0...v0.91.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
Brenda Wallace
bec1ab8c5b
Match Gemfile ruby version in .ruby-version
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
57dcacdfec
Bump percy-capybara from 4.3.2 to 4.3.3
...
Bumps [percy-capybara](https://github.com/percy/percy-capybara ) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/percy/percy-capybara/releases )
- [Commits](https://github.com/percy/percy-capybara/compare/v4.3.2...v4.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
3e38e30f4f
Bump unicorn from 5.6.0 to 5.7.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.6.0 to 5.7.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
454a8857df
Bump rspectre from 0.0.1 to 0.0.3
...
Bumps [rspectre](https://github.com/dgollahon/rspectre ) from 0.0.1 to 0.0.3.
- [Release notes](https://github.com/dgollahon/rspectre/releases )
- [Changelog](https://github.com/dgollahon/rspectre/blob/master/CHANGELOG.md )
- [Commits](https://github.com/dgollahon/rspectre/compare/v0.0.1...v0.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
fbfbc67a05
Bump sidekiq from 6.1.1 to 6.1.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.1.1 to 6.1.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.1.1...v6.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
99f38bcfba
Bump leaflet-rails from 1.6.0 to 1.7.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
7beec65fe9
Bump rack-protection from 2.0.8.1 to 2.1.0
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.8.1 to 2.1.0.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.8.1...v2.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
5961bd3a3f
Bump oj from 3.10.13 to 3.10.14
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.13 to 3.10.14.
- [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.13...v3.10.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-20 12:03:06 +13:00
Brenda Wallace
5b272a5d33
Merge remote-tracking branch 'upstream/mainline' into dev
2020-10-16 15:48:35 +13:00
Brenda Wallace
7c526d4b11
Cards raised on hover
2020-10-16 15:46:34 +13:00
Brenda Wallace
b9e68d09ca
Make the connecting to flickr more obvious
...
by making it a button with an icon
2020-10-16 12:05:42 +13:00
dependabot-preview[bot]
8a3e310a84
Bump timecop from 0.9.1 to 0.9.2
...
Bumps [timecop](https://github.com/travisjeffery/timecop ) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/travisjeffery/timecop/releases )
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md )
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.1...v0.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-16 11:07:38 +13:00
dependabot-preview[bot]
b23b372c8c
Bump rubocop from 0.93.0 to 0.93.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.93.0 to 0.93.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.93.0...v0.93.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-14 16:20:23 +13:00
dependabot-preview[bot]
98dc9636df
Bump geocoder from 1.6.3 to 1.6.4
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.6.3 to 1.6.4.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.3...v1.6.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-12 18:34:12 +13:00
dependabot-preview[bot]
b965f09ee3
Merge pull request #2659 from Growstuff/dependabot/bundler/rubocop-0.93.0
2020-10-10 06:50:01 +00:00
dependabot-preview[bot]
e8a5936eca
Bump rubocop from 0.92.0 to 0.93.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.92.0 to 0.93.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.92.0...v0.93.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-10 06:27:38 +00:00
dependabot-preview[bot]
d247be5b12
Merge pull request #2655 from Growstuff/dependabot/bundler/haml-5.2.0
2020-10-10 06:25:53 +00:00
dependabot-preview[bot]
45a48394e6
Bump haml from 5.1.2 to 5.2.0
...
Bumps [haml](https://github.com/haml/haml ) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/v5.1.2...v5.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-10 05:58:15 +00:00
dependabot-preview[bot]
504163bda8
Merge pull request #2656 from Growstuff/dependabot/bundler/better_errors-2.8.3
2020-10-10 05:56:34 +00:00
dependabot-preview[bot]
fbe65988d1
Bump better_errors from 2.8.2 to 2.8.3
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.2...v2.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-10 05:34:42 +00:00
dependabot-preview[bot]
0f178d8608
Bump chartkick from 3.4.0 to 3.4.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.4.0 to 3.4.1.
- [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.0...v3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-10 18:32:48 +13:00
dependabot-preview[bot]
985356e055
Merge pull request #2651 from Growstuff/dependabot/bundler/dalli-2.7.11
2020-10-02 00:28:23 +00:00
dependabot-preview[bot]
3baa39cb72
Bump dalli from 2.7.10 to 2.7.11
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.10 to 2.7.11.
- [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.10...v2.7.11 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-02 00:07:46 +00:00
dependabot-preview[bot]
b68e6844ab
Merge pull request #2641 from Growstuff/dependabot/bundler/faker-2.14.0
2020-10-02 00:06:01 +00:00
dependabot-preview[bot]
75fec864fd
Bump faker from 2.13.0 to 2.14.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.13.0 to 2.14.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.13.0...v2.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-01 23:44:10 +00:00
dependabot-preview[bot]
9af346ffb1
Merge pull request #2648 from Growstuff/dependabot/bundler/validate_url-1.0.13
2020-10-01 23:42:26 +00:00
dependabot-preview[bot]
100db699ae
Bump validate_url from 1.0.11 to 1.0.13
...
Bumps [validate_url](https://github.com/perfectline/validates_url ) from 1.0.11 to 1.0.13.
- [Release notes](https://github.com/perfectline/validates_url/releases )
- [Commits](https://github.com/perfectline/validates_url/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-01 23:20:49 +00:00
dependabot-preview[bot]
205b1967de
Merge pull request #2650 from Growstuff/dependabot/bundler/rubocop-0.92.0
2020-10-01 23:18:44 +00:00
dependabot-preview[bot]
aacd276359
Bump rubocop from 0.91.0 to 0.92.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.91.0 to 0.92.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.91.0...v0.92.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-01 22:53:29 +00:00
dependabot-preview[bot]
bd2b917b0b
Merge pull request #2652 from Growstuff/dependabot/bundler/puma-5.0.2
2020-10-01 22:51:36 +00:00
dependabot-preview[bot]
526a6688bc
Bump puma from 4.3.6 to 5.0.2
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.6 to 5.0.2.
- [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.3.6...v5.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-01 22:11:14 +00:00
dependabot-preview[bot]
40f82843b2
Merge pull request #2654 from Growstuff/dependabot/bundler/better_errors-2.8.2
2020-10-01 22:09:17 +00:00
dependabot-preview[bot]
1a1a70bebc
Bump better_errors from 2.7.1 to 2.8.2
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.7.1 to 2.8.2.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-01 21:47:58 +00:00
dependabot-preview[bot]
ea707c082a
Merge pull request #2653 from Growstuff/dependabot/bundler/haml_lint-0.36.0
2020-10-01 21:45:49 +00:00
dependabot-preview[bot]
137385ea6f
Bump haml_lint from 0.35.0 to 0.36.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.35.0 to 0.36.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.35.0...v0.36.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-01 08:06:34 +00:00
dependabot-preview[bot]
84102b7ed9
Bump devise from 4.7.2 to 4.7.3
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.2 to 4.7.3.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.2...v4.7.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-28 18:58:23 +13:00
dependabot-preview[bot]
a350cc02d4
Bump query_diet from 0.6.2 to 0.7.0
...
Bumps [query_diet](https://github.com/makandra/query_diet ) from 0.6.2 to 0.7.0.
- [Release notes](https://github.com/makandra/query_diet/releases )
- [Changelog](https://github.com/makandra/query_diet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/makandra/query_diet/compare/v0.6.2...v0.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-28 18:47:38 +13:00
dependabot-preview[bot]
9782708a78
Merge pull request #2640 from Growstuff/dependabot/bundler/rubocop-rails-2.8.1
2020-09-18 04:17:57 +00:00
dependabot-preview[bot]
89e3a05003
Bump rubocop-rails from 2.8.0 to 2.8.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.0...v2.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-18 03:57:04 +00:00
Brenda Wallace
0300471762
bump codeclimate to rubocop 0.91
2020-09-18 15:54:57 +12:00
dependabot-preview[bot]
f1fa7dce55
Bump rubocop from 0.90.0 to 0.91.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.90.0 to 0.91.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.90.0...v0.91.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-18 15:54:57 +12:00
Brenda Wallace
30d7d4a288
Match Gemfile ruby version in .ruby-version
2020-09-14 09:24:40 +12:00
dependabot-preview[bot]
ca2407928c
Bump percy-capybara from 4.3.2 to 4.3.3
...
Bumps [percy-capybara](https://github.com/percy/percy-capybara ) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/percy/percy-capybara/releases )
- [Commits](https://github.com/percy/percy-capybara/compare/v4.3.2...v4.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-11 16:21:13 +12:00
dependabot-preview[bot]
48dfdbb1a7
Merge pull request #2636 from Growstuff/dependabot/bundler/unicorn-5.7.0
2020-09-10 03:11:20 +00:00
dependabot-preview[bot]
ce0d93b8e1
Bump unicorn from 5.6.0 to 5.7.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.6.0 to 5.7.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-10 02:48:57 +00:00
dependabot-preview[bot]
e8762d9808
Merge pull request #2635 from Growstuff/dependabot/bundler/rspectre-0.0.3
2020-09-10 02:47:10 +00:00
dependabot-preview[bot]
c2486c27e3
Bump rspectre from 0.0.1 to 0.0.3
...
Bumps [rspectre](https://github.com/dgollahon/rspectre ) from 0.0.1 to 0.0.3.
- [Release notes](https://github.com/dgollahon/rspectre/releases )
- [Changelog](https://github.com/dgollahon/rspectre/blob/master/CHANGELOG.md )
- [Commits](https://github.com/dgollahon/rspectre/compare/v0.0.1...v0.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-10 02:25:08 +00:00
dependabot-preview[bot]
03d0fd6fd7
Merge pull request #2633 from Growstuff/dependabot/bundler/sidekiq-6.1.2
2020-09-10 02:23:29 +00:00
dependabot-preview[bot]
5eacbbf661
Bump sidekiq from 6.1.1 to 6.1.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.1.1 to 6.1.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.1.1...v6.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 07:14:07 +00:00
dependabot-preview[bot]
893240610a
Merge pull request #2631 from Growstuff/dependabot/bundler/leaflet-rails-1.7.0
2020-09-08 05:03:19 +00:00
dependabot-preview[bot]
5275b4975e
Bump leaflet-rails from 1.6.0 to 1.7.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 04:41:41 +00:00
dependabot-preview[bot]
e52c151306
Merge pull request #2632 from Growstuff/dependabot/bundler/rack-protection-2.1.0
2020-09-08 04:39:58 +00:00
dependabot-preview[bot]
ad8c3d647c
Bump rack-protection from 2.0.8.1 to 2.1.0
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.8.1 to 2.1.0.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.8.1...v2.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 04:19:12 +00:00
dependabot-preview[bot]
e591ecf377
Merge pull request #2630 from Growstuff/dependabot/bundler/oj-3.10.14
2020-09-08 04:17:08 +00:00
dependabot-preview[bot]
3c5e88f0f3
Bump oj from 3.10.13 to 3.10.14
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.13 to 3.10.14.
- [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.13...v3.10.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 03:57:31 +00:00
dependabot-preview[bot]
6c6c8b81e6
Bump puma from 4.3.5 to 4.3.6
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.5 to 4.3.6.
- [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.3.5...v4.3.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 15:56:26 +12:00
dependabot-preview[bot]
b241e17132
Bump rubocop-rails from 2.7.1 to 2.8.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.7.1...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 15:56:26 +12:00
dependabot-preview[bot]
18a8ae6ca3
Bump percy-capybara from 4.2.0 to 4.3.2
...
Bumps [percy-capybara](https://github.com/percy/percy-capybara ) from 4.2.0 to 4.3.2.
- [Release notes](https://github.com/percy/percy-capybara/releases )
- [Commits](https://github.com/percy/percy-capybara/compare/v4.2.0...v4.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 15:56:26 +12:00
Brenda Wallace
59e32e74ed
bump rubocop to 0.90 on codeclimate
2020-09-08 15:56:26 +12:00
dependabot-preview[bot]
cfff7c1811
Bump rubocop from 0.89.1 to 0.90.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.89.1 to 0.90.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.89.1...v0.90.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 15:56:26 +12:00
dependabot-preview[bot]
c1d6d2c386
Bump oj from 3.10.12 to 3.10.13
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.12 to 3.10.13.
- [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.12...v3.10.13 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 15:56:26 +12:00
Brenda Wallace
1dfd9f0062
Merge pull request #2629 from Growstuff/dependabot/bundler/puma-4.3.6
...
Bump puma from 4.3.5 to 4.3.6
2020-09-08 15:55:37 +12:00
dependabot-preview[bot]
9956d64462
Bump puma from 4.3.5 to 4.3.6
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.5 to 4.3.6.
- [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.3.5...v4.3.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-07 07:42:27 +00:00
Brenda Wallace
82edcb8557
Merge branch 'mainline' into dev
2020-09-07 09:35:37 +12:00
Brenda Wallace
21330f55b0
Merge pull request #2627 from Growstuff/dependabot/bundler/rubocop-rails-2.8.0
...
Bump rubocop-rails from 2.7.1 to 2.8.0
2020-09-07 09:35:00 +12:00
dependabot-preview[bot]
08f583d33f
Bump rubocop-rails from 2.7.1 to 2.8.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.7.1...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-04 07:15:40 +00:00
Brenda Wallace
7337f10c3e
Merge pull request #2626 from Growstuff/dependabot/bundler/percy-capybara-4.3.2
...
Bump percy-capybara from 4.2.0 to 4.3.2
2020-09-04 09:24:40 +12:00
dependabot-preview[bot]
7f5013ce89
Bump percy-capybara from 4.2.0 to 4.3.2
...
Bumps [percy-capybara](https://github.com/percy/percy-capybara ) from 4.2.0 to 4.3.2.
- [Release notes](https://github.com/percy/percy-capybara/releases )
- [Commits](https://github.com/percy/percy-capybara/compare/v4.2.0...v4.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-03 07:15:40 +00:00
Brenda Wallace
a37a86f1ae
Merge pull request #2625 from Growstuff/dependabot/bundler/rubocop-0.90.0
...
Bump rubocop from 0.89.1 to 0.90.0
2020-09-02 14:57:38 +12:00
Brenda Wallace
67f2d54ef8
bump rubocop to 0.90 on codeclimate
2020-09-02 10:34:59 +12:00
dependabot-preview[bot]
8ee5e9b01b
Bump rubocop from 0.89.1 to 0.90.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.89.1 to 0.90.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.89.1...v0.90.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-01 08:11:44 +00:00
Brenda Wallace
f5f1d996be
Merge pull request #2624 from Growstuff/dependabot/bundler/oj-3.10.13
...
Bump oj from 3.10.12 to 3.10.13
2020-09-01 10:51:24 +12:00
dependabot-preview[bot]
06b5443a22
Bump oj from 3.10.12 to 3.10.13
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.12 to 3.10.13.
- [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.12...v3.10.13 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-28 07:13:59 +00:00
Brenda Wallace
a2e9886366
Merge pull request #2620 from Growstuff/dev
...
Production deploy
2020-08-28 09:29:03 +12:00
dependabot-preview[bot]
5b3a1b1d48
Merge pull request #2622 from Growstuff/dependabot/bundler/omniauth-facebook-7.0.0
2020-08-27 09:35:42 +00:00
dependabot-preview[bot]
0e39b1ab4e
Bump omniauth-facebook from 6.0.0 to 7.0.0
...
Bumps [omniauth-facebook](https://github.com/mkdynamic/omniauth-facebook ) from 6.0.0 to 7.0.0.
- [Release notes](https://github.com/mkdynamic/omniauth-facebook/releases )
- [Changelog](https://github.com/simi/omniauth-facebook/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mkdynamic/omniauth-facebook/compare/v6.0.0...v7.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-27 09:13:50 +00:00
Brenda Wallace
8e4212bdbc
Merge pull request #2623 from Growstuff/dependabot/bundler/loofah-2.7.0
...
Bump loofah from 2.6.0 to 2.7.0
2020-08-27 21:11:54 +12:00
dependabot-preview[bot]
ddf366bd3c
Bump loofah from 2.6.0 to 2.7.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.6.0 to 2.7.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.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-27 07:16:03 +00:00
dependabot-preview[bot]
ed81808f58
Bump scout_apm from 2.6.8 to 2.6.9
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.8 to 2.6.9.
- [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.8...v2.6.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-27 14:19:00 +12:00
dependabot-preview[bot]
2b8286a5d6
Bump oj from 3.10.8 to 3.10.12
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.8 to 3.10.12.
- [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.8...v3.10.12 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-27 11:33:35 +12:00
Brenda Wallace
5a883aa9b3
Merge remote-tracking branch 'upstream/dev' into dev
2020-08-27 11:32:27 +12:00
Brenda Wallace
2db6ff86e5
Merge remote-tracking branch 'upstream/mainline' into dev
2020-08-27 11:32:06 +12:00
dependabot-preview[bot]
aac7d7109f
Bump rubocop-rspec from 1.42.0 to 1.43.2
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.42.0 to 1.43.2.
- [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.42.0...v1.43.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-27 07:57:57 +12:00
Awesome Code
10f72d2b21
Auto corrected by following Format Css Code
2020-08-26 12:39:47 +12:00
Brenda Wallace
1179346dd5
Elastic version in example env
2020-08-26 12:36:58 +12:00
Brenda
be64224477
Cache yarn on travis
2020-08-26 12:36:58 +12:00
Brenda
d3eda90000
Adding new cops
2020-08-26 12:36:58 +12:00
Brenda
0b3583e099
DRY crops controller more
2020-08-26 12:36:58 +12:00
Brenda Wallace
0108224e4e
Tests for crop creation
2020-08-26 12:36:58 +12:00
Brenda Wallace
7def8881b4
Allow discard gem upgrade
2020-08-26 12:36:58 +12:00
Brenda Wallace
c4b4d382e2
Upgrade percy-capybara
2020-08-26 12:36:58 +12:00
Brenda Wallace
2a896f99f5
Upgrade omniauth
2020-08-26 12:36:58 +12:00
Brenda Wallace
94b481efaf
Upgrade to rubocop 0.89 on codeclimate
2020-08-26 12:36:58 +12:00
Brenda Wallace
08ecd0ebee
Source .env when checking for elastisearch
2020-08-26 12:36:58 +12:00
Brenda Wallace
a7ab356298
Updating the setup script
2020-08-26 12:36:58 +12:00
Brenda Wallace
e029252c04
Only build dev and mainline
2020-08-26 12:36:58 +12:00
Brenda Wallace
43c1ea21b3
Configure contributor check for github actions
2020-08-26 12:36:58 +12:00
Brenda
ff87a9fa5d
gem updates
2020-08-26 12:36:58 +12:00
Brenda Wallace
5b2355bf42
check out repo
2020-08-26 12:36:58 +12:00
Brenda Wallace
1c9ff5c876
removing last mention of cloudmade
...
this company used to produce the leaflet widget, but that staff member moved elsewhere in like 2012 and took the code with them and made it open source. the credit is no longer needed
2020-08-26 12:36:58 +12:00
Brenda Wallace
f2b385bd5e
Help view spec find the correct template
2020-08-26 12:36:58 +12:00
Brenda Wallace
b1b2661682
only run static checks on github
2020-08-26 12:36:58 +12:00
Brenda Wallace
5fec0d4eb9
Adding ru files to codeclimate
2020-08-26 12:36:58 +12:00
Brenda Wallace
552ff6a680
Explaning why brakeman is off
2020-08-26 12:36:58 +12:00
Brenda Wallace
fe0157641a
Removing dependabot config
2020-08-26 12:36:58 +12:00
Brenda Wallace
83699656e4
Renaming notifier to new rails 6 style
2020-08-26 12:36:58 +12:00
Brenda Wallace
b9c411d385
Removed cloudmade test
2020-08-26 12:36:58 +12:00
Brenda Wallace
96f40c9c6b
Comment out a migration that needs an old gem to work
2020-08-26 12:36:58 +12:00
Brenda Wallace
ec778394ab
Upgrade to activemedian 0.2.0
2020-08-26 12:36:58 +12:00
Brenda Wallace
0a604ede52
Run github actions on push, pull request
2020-08-26 12:36:58 +12:00
Brenda Wallace
2ab935918c
Removed extra steps on travis
2020-08-26 12:36:58 +12:00
Brenda Wallace
d6aefc1ac7
seperate steps on travis
2020-08-26 12:36:58 +12:00
Brenda Wallace
c1922e5bc3
Remove extra env variable
2020-08-26 12:36:58 +12:00
Brenda Wallace
bf6e2719a4
Update name from Notifier to NotifierMailer
2020-08-26 12:36:58 +12:00
Brenda Wallace
18750063e8
Prepare database in travis run
2020-08-26 12:36:58 +12:00
Brenda Wallace
9b6a1b9fce
Removed contributor check from travis
2020-08-26 12:36:58 +12:00
Brenda Wallace
8016a35e49
Adding contributor check to github actions
2020-08-26 12:36:58 +12:00
Brenda Wallace
bcc722d0c2
Updating content type in tests to include charset
2020-08-26 12:36:58 +12:00
Brenda Wallace
5f2010daa2
Ensuring the postgresql media functions exist
2020-08-26 12:36:58 +12:00
Brenda Wallace
fb37cf8843
Adding github actions
2020-08-26 12:36:58 +12:00
Brenda Wallace
05dabd0ded
ensure the activemedian methods are in the test db
2020-08-26 12:36:58 +12:00
Brenda Wallace
f1d830bfa9
fixed ambiguous negative
2020-08-26 12:36:58 +12:00
Brenda Wallace
63caea1a6a
Use member.kpt in auth
2020-08-26 12:36:58 +12:00
Brenda Wallace
cebec27e80
Prefer ary[n..] over ary[n..-1].
2020-08-26 12:36:58 +12:00
Brenda Wallace
328afa91fa
removed redundant escaping
2020-08-26 12:36:58 +12:00
Brenda Wallace
9ecab8358e
run travis-ci as test
2020-08-26 12:36:58 +12:00
Brenda Wallace
133f0a563f
Add active median in test runner on travis-ci
2020-08-26 12:36:58 +12:00
Brenda Wallace
4906aaa180
Rename Notifer to NotifierMailer
2020-08-26 12:36:58 +12:00
Brenda Wallace
33944adf6c
Rubocop indentation fixes
2020-08-26 12:36:58 +12:00
Brenda Wallace
958ee66e79
Apply suggestions from code review
2020-08-26 12:36:58 +12:00
Brenda Wallace
6a485e9f5f
Disabling brakeman on codeclimate because it doesn't understand rails 6
2020-08-26 12:36:58 +12:00
Brenda Wallace
967ae22088
Apply suggestions from code review
2020-08-26 12:36:58 +12:00
Brenda
ef37f74c0f
Splitting up complex method in photos controller
2020-08-26 12:36:58 +12:00
Brenda
16895d2ddb
Added missing unique constraint to garden_types
2020-08-26 12:36:58 +12:00
Brenda Wallace
234c3c604f
Rubocop target is rails 6.0
2020-08-26 12:36:58 +12:00
Brenda Wallace
23fac43cad
Removing link to cloudmade
...
because they no longer exist and the domain is used by something else now
2020-08-26 12:36:58 +12:00
Brenda Wallace
8a5a19f0c6
Removing deprecated commented out parts of application.rb
2020-08-26 12:36:58 +12:00
Brenda
13c675d6f7
rewrote order by to not be raw sql
2020-08-26 12:36:58 +12:00
Brenda
59e0a13f42
removed redundant assignment
2020-08-26 12:36:58 +12:00
Brenda Wallace
64ce6ef886
Align end
2020-08-26 12:36:58 +12:00
Brenda
5573fbfbb6
foreign key declarations not needed anymore
2020-08-26 12:36:58 +12:00
Brenda Wallace
15d72d3769
Enable the new rubocop cops
2020-08-26 12:36:58 +12:00
Brenda
c63693a68c
Rubocop fixes after rails 6 upgrades
2020-08-26 12:36:58 +12:00
Brenda Wallace
9dbf8b7c8f
New robocops
2020-08-26 12:36:58 +12:00
Brenda Wallace
59efe92648
Upgrade to rails 6
2020-08-26 12:36:58 +12:00
Brenda Wallace
9d1feef226
Upgrade rails gem to 6
2020-08-26 12:36:58 +12:00
dependabot-preview[bot]
87a271cf69
Bump chartkick from 3.3.2 to 3.4.0
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.3.2 to 3.4.0.
- [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.3.2...v3.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-15 13:34:05 +12:00
dependabot-preview[bot]
a79efbc0dd
[Security] Bump kramdown from 2.2.1 to 2.3.0
...
Bumps [kramdown](https://github.com/gettalong/kramdown ) from 2.2.1 to 2.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/gettalong/kramdown/releases )
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page )
- [Commits](https://github.com/gettalong/kramdown/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-15 13:34:05 +12:00
Brenda Wallace
15be089b83
Ignore the .env file
2020-08-15 13:34:05 +12:00
Brenda Wallace
807943da25
Remove figaro gem and use rails-dotenv
2020-08-15 13:34:05 +12:00
dependabot-preview[bot]
8c1a2356a6
Bump chartkick from 3.3.2 to 3.4.0
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.3.2 to 3.4.0.
- [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.3.2...v3.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-10 15:24:59 +12:00
Brenda Wallace
4016440aaa
Merge branch 'mainline' into dev
2020-08-09 00:30:12 +12:00
dependabot-preview[bot]
7c8a0c9842
[Security] Bump kramdown from 2.2.1 to 2.3.0
...
Bumps [kramdown](https://github.com/gettalong/kramdown ) from 2.2.1 to 2.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/gettalong/kramdown/releases )
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page )
- [Commits](https://github.com/gettalong/kramdown/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-09 00:25:23 +12:00
Brenda Wallace
730d717e39
Merge pull request #2598 from Br3nda/feature/dotenv
...
Remove figaro gem and use rails-dotenv
2020-08-02 14:23:59 +12:00
Brenda Wallace
34b79eebad
Merge pull request #2582 from Growstuff/dev
...
Production release
2020-08-02 14:23:46 +12:00
Brenda Wallace
3596ef1a10
Ignore the .env file
2020-08-02 08:20:52 +12:00
Brenda Wallace
92f8a84369
Remove figaro gem and use rails-dotenv
2020-08-01 20:24:21 +12:00
dependabot-preview[bot]
0e3ed813df
Bump sidekiq from 6.0.7 to 6.1.1
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.7 to 6.1.1.
- [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.7...v6.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-01 20:22:29 +12:00
dependabot-preview[bot]
af72f42fb8
Bump rubocop-rspec from 1.40.0 to 1.42.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.40.0 to 1.42.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.40.0...v1.42.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-01 20:22:14 +12:00
Brenda Wallace
4f14825caf
Merge remote-tracking branch 'upstream/mainline' into dev
2020-07-30 07:57:56 +12:00
dependabot-preview[bot]
39aa8bfb0f
Bump factory_bot_rails from 6.0.0 to 6.1.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.0.0...v6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-30 07:53:59 +12:00
dependabot-preview[bot]
aac0448f03
Bump rubocop-rails from 2.6.0 to 2.7.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.6.0 to 2.7.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.6.0...v2.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-29 17:08:52 +12:00
dependabot-preview[bot]
323e6ccd55
Bump unicorn from 5.5.5 to 5.6.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.5 to 5.6.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-29 17:08:38 +12:00
dependabot-preview[bot]
cc685a6c4d
Bump chartkick from 3.3.1 to 3.3.2
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.3.1 to 3.3.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.3.1...v3.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-29 17:08:26 +12:00
dependabot-preview[bot]
61e0a76c08
Bump oj from 3.10.7 to 3.10.8
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.7 to 3.10.8.
- [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.7...v3.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-29 17:08:11 +12:00
dependabot-preview[bot]
047238c5f7
Merge pull request #2589 from Growstuff/dependabot/bundler/oj-3.10.7
2020-07-21 23:33:13 +00:00
dependabot-preview[bot]
e50de451bb
Bump oj from 3.10.6 to 3.10.7
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.6 to 3.10.7.
- [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.6...v3.10.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-21 22:18:52 +00:00
dependabot-preview[bot]
925e69fac5
Bump rubocop-rspec from 1.40.0 to 1.41.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.40.0 to 1.41.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.40.0...v1.41.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-22 10:16:43 +12:00
dependabot-preview[bot]
bcd7e144c4
Bump sidekiq from 6.0.7 to 6.1.0
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.7 to 6.1.0.
- [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.7...v6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-22 10:16:25 +12:00
Brenda Wallace
e146d7db4f
Update .codeclimate.yml
2020-07-22 10:14:40 +12:00
dependabot-preview[bot]
fdec444227
Bump rubocop from 0.86.0 to 0.88.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.86.0 to 0.88.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.86.0...v0.88.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-22 10:14:40 +12:00
dependabot-preview[bot]
62aea864e8
Bump searchkick from 4.4.0 to 4.4.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.4.0 to 4.4.1.
- [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.4.0...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-29 11:30:55 +12:00
dependabot-preview[bot]
8ae8006348
Merge pull request #2581 from Growstuff/dependabot/bundler/scout_apm-2.6.8
2020-06-26 10:08:25 +00:00
dependabot-preview[bot]
977ade335b
Bump scout_apm from 2.6.7 to 2.6.8
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.7 to 2.6.8.
- [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.7...v2.6.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-26 09:30:19 +00:00
dependabot-preview[bot]
4b0fc5130e
Merge pull request #2578 from Growstuff/dependabot/bundler/faker-2.13.0
2020-06-26 09:28:17 +00:00
dependabot-preview[bot]
c760ef2766
Bump faker from 2.12.0 to 2.13.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.12.0 to 2.13.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.12.0...v2.13.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-26 09:00:17 +00:00
dependabot-preview[bot]
6c7da68716
Bump rails-controller-testing from 1.0.4 to 1.0.5
...
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing ) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/rails/rails-controller-testing/releases )
- [Commits](https://github.com/rails/rails-controller-testing/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-26 20:58:23 +12:00
dependabot-preview[bot]
241fdbce83
Bump rubocop from 0.85.1 to 0.86.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.85.1 to 0.86.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.85.1...v0.86.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-23 15:11:22 +12:00
dependabot-preview[bot]
dd12f638bc
Bump geocoder from 1.6.1 to 1.6.3
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.6.1 to 1.6.3.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.1...v1.6.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-23 14:29:19 +12:00
dependabot-preview[bot]
334dd0fffa
Bump capybara from 3.32.2 to 3.33.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.2 to 3.33.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.32.2...3.33.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-23 14:28:51 +12:00
Brenda Wallace
4213b05af4
Removed TODO about geocoder in gemfile
2020-06-20 11:26:57 +12:00
Brenda
61ea4da089
Updated test stubs to support geocoder 1.6
...
https://github.com/alexreisner/geocoder/issues/1258
2020-06-20 11:26:57 +12:00
dependabot[bot]
1d5ab7aa9b
Bump geocoder from 1.4.9 to 1.6.1
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.4.9 to 1.6.1.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.4.9...v1.6.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2020-06-20 11:26:57 +12:00
dependabot-preview[bot]
16122e3313
Bump factory_bot_rails from 5.2.0 to 6.0.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 5.2.0 to 6.0.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.2.0...v6.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-20 11:26:57 +12:00
Brenda Wallace
d2f4f666f2
Remove unused apps from deploy
2020-06-20 11:26:57 +12:00
Brenda Wallace
d344fd86b5
Migrate to mainline
2020-06-20 11:26:57 +12:00
dependabot-preview[bot]
1e31fe62ca
Bump searchkick from 4.3.1 to 4.4.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.3.1 to 4.4.0.
- [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.3.1...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-20 11:26:57 +12:00
dependabot-preview[bot]
acd529abae
Bump loofah from 2.5.0 to 2.6.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.5.0 to 2.6.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.5.0...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-20 11:26:57 +12:00
Brenda Wallace
e315f78ac9
Removed TODO about geocoder in gemfile
2020-06-20 10:57:03 +12:00
Brenda
a4afeea025
Updated test stubs to support geocoder 1.6
...
https://github.com/alexreisner/geocoder/issues/1258
2020-06-20 10:57:03 +12:00
dependabot[bot]
4ba4abf6e9
Bump geocoder from 1.4.9 to 1.6.1
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.4.9 to 1.6.1.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.4.9...v1.6.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2020-06-20 10:57:03 +12:00
dependabot-preview[bot]
27c2cec1a1
Merge pull request #2574 from Growstuff/dependabot/bundler/factory_bot_rails-6.0.0
2020-06-19 20:04:50 +00:00
dependabot-preview[bot]
918f709cac
Bump factory_bot_rails from 5.2.0 to 6.0.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 5.2.0 to 6.0.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.2.0...v6.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-19 19:39:45 +00:00
Brenda Wallace
dbe332d6e5
Remove unused apps from deploy
2020-06-20 07:35:59 +12:00
Brenda Wallace
b43916f1eb
Migrate to mainline
2020-06-20 07:35:59 +12:00
dependabot-preview[bot]
edf6f4b646
Bump searchkick from 4.3.1 to 4.4.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.3.1 to 4.4.0.
- [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.3.1...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-18 22:33:00 +12:00
Brenda Wallace
f952f83b9b
Merge branch 'mainline' into dev
2020-06-18 10:47:17 +12:00
Brenda Wallace
b523d359fc
Merge pull request #2570 from Growstuff/dependabot/bundler/loofah-2.6.0
...
Bump loofah from 2.5.0 to 2.6.0
2020-06-18 10:42:17 +12:00
dependabot-preview[bot]
c14abbea52
Bump loofah from 2.5.0 to 2.6.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.5.0 to 2.6.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.5.0...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-17 08:43:37 +00:00
Brenda Wallace
be014766d6
Merge pull request #2568 from Growstuff/dev
...
Production release
2020-06-17 16:03:00 +12:00
Daniel O'Connor
6247bb59b0
Merge pull request #2567 from Growstuff/dependabot/bundler/rack-2.2.3
...
[Security] Bump rack from 2.2.2 to 2.2.3
2020-06-16 13:34:33 +09:30
dependabot-preview[bot]
0ff701c9d5
[Security] Bump rack from 2.2.2 to 2.2.3
...
Bumps [rack](https://github.com/rack/rack ) from 2.2.2 to 2.2.3. **This update includes a security fix.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/v2.2.2...2.2.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-15 23:01:42 +00:00
Brenda Wallace
f08649bd00
Merge pull request #2555 from Br3nda/gem-upgrades
...
Gem upgrades, including Rails 5.2.4.3
2020-06-15 15:11:27 +12:00
Brenda Wallace
a6c378c517
Removed the space from file name
2020-06-15 15:11:03 +12:00
Brenda Wallace
3604acdb67
Added crop.parent back into api
2020-06-15 10:34:35 +12:00
Brenda Wallace
264e81249c
Merge remote-tracking branch 'upstream/dev' into gem-upgrades
...
Conflicts:
Gemfile.lock
2020-06-15 10:34:25 +12:00
dependabot-preview[bot]
dc4d82aea4
Bump rubocop-rspec from 1.39.0 to 1.40.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.39.0 to 1.40.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.39.0...v1.40.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-13 17:02:54 +12:00
dependabot-preview[bot]
c6c1fc5aa0
Bump devise from 4.7.1 to 4.7.2
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.1...v4.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-12 20:44:13 +12:00
Brenda Wallace
15a82d46bf
Merge pull request #2560 from Growstuff/dependabot/bundler/rubocop-0.85.1
...
Bump rubocop from 0.85.0 to 0.85.1
2020-06-09 17:03:01 +12:00
Brenda Wallace
b96701b304
Merge pull request #2561 from Growstuff/dependabot/bundler/capybara-email-3.0.2
...
Bump capybara-email from 3.0.1 to 3.0.2
2020-06-09 17:02:38 +12:00
dependabot-preview[bot]
9df23d0af8
Bump rubocop from 0.85.0 to 0.85.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.85.0 to 0.85.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.85.0...v0.85.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-08 23:11:03 +00:00
dependabot-preview[bot]
8ff16ec4c8
Bump capybara-email from 3.0.1 to 3.0.2
...
Bumps [capybara-email](https://github.com/dockyard/capybara-email ) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/dockyard/capybara-email/releases )
- [Changelog](https://github.com/DavyJonesLocker/capybara-email/blob/master/CHANGELOG.md )
- [Commits](https://github.com/dockyard/capybara-email/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-08 23:11:02 +00:00
dependabot-preview[bot]
b51de07b7e
Merge pull request #2557 from Growstuff/dependabot/bundler/platform-api-3.0.0
2020-06-08 23:09:04 +00:00
dependabot-preview[bot]
56592185d4
Bump platform-api from 2.2.0 to 3.0.0
...
Bumps [platform-api](https://github.com/heroku/platform-api ) from 2.2.0 to 3.0.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/v2.2.0...v3.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-08 22:24:22 +00:00
Brenda Wallace
612017c818
Merge pull request #2559 from Growstuff/dependabot/bundler/rubocop-rails-2.6.0
...
Bump rubocop-rails from 2.5.2 to 2.6.0
2020-06-09 10:22:22 +12:00
dependabot-preview[bot]
1ec68f52fd
Bump rubocop-rails from 2.5.2 to 2.6.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.2...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-08 09:59:46 +00:00
Brenda Wallace
c223f1a937
Upgraded gems
2020-06-03 16:11:15 +12:00
Brenda Wallace
78677deaeb
Merge branch 'gem-upgrades' of github.com:Br3nda/growstuff into gem-upgrades
2020-06-03 15:50:32 +12:00
Brenda Wallace
0da31a3823
Adding precompile before search index in travis script
2020-06-03 15:50:03 +12:00
Brenda Wallace
06f64a91e9
Merge pull request #2549 from Growstuff/dev
...
Production release
2020-06-03 15:43:29 +12:00
codefactor-io
311004af50
[CodeFactor] Apply fixes
2020-06-03 03:31:15 +00:00
Brenda Wallace
e10e4285ce
Comment our crop parent on api resource until we can specify the model
2020-06-03 15:30:13 +12:00
Brenda Wallace
52258d6773
downgrade sprockets
2020-06-03 15:29:14 +12:00
Brenda Wallace
877e79ec68
Merge branch 'gem-upgrades' of github.com:Br3nda/growstuff into gem-upgrades
2020-06-03 15:27:22 +12:00
Brenda Wallace
b2cc346e92
Don't need to explitcyl add active support
2020-06-03 15:27:14 +12:00
Brenda Wallace
38e6e2cfab
Added manifest.js, because rails-sprockets need it now
2020-06-03 15:26:38 +12:00
Brenda Wallace
981bf367e7
Merge branch 'dev' into gem-upgrades
2020-06-03 10:44:42 +12:00
Brenda Wallace
08bde354b2
Gem upgrades, including Rails 5.2.4.3
2020-06-03 10:43:32 +12:00
dependabot-preview[bot]
672170b4d0
Merge pull request #2553 from Growstuff/dependabot/bundler/webdrivers-4.4.1
2020-06-02 12:51:22 +00:00
dependabot-preview[bot]
9d2302d4be
Bump webdrivers from 4.4.0 to 4.4.1
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.4.0 to 4.4.1.
- [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.4.0...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-02 12:26:46 +00:00
dependabot-preview[bot]
de962ab281
Bump rubocop from 0.84.0 to 0.85.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.84.0 to 0.85.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.84.0...v0.85.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-03 00:24:21 +12:00
Daniel O'Connor
d7b591e876
Merge pull request #2551 from Growstuff/dependabot/bundler/faker-2.12.0
...
Bump faker from 2.11.0 to 2.12.0
2020-06-02 15:21:15 +09:30
Daniel O'Connor
bdd1e2beb9
Merge pull request #2552 from Growstuff/dependabot/bundler/responders-3.0.1
...
Bump responders from 3.0.0 to 3.0.1
2020-06-02 15:19:32 +09:30
Daniel O'Connor
5ef3c5729c
Merge pull request #2550 from Growstuff/dependabot/bundler/webdrivers-4.4.0
...
Bump webdrivers from 4.3.0 to 4.4.0
2020-06-02 15:19:06 +09:30
dependabot-preview[bot]
f526af8d44
Bump responders from 3.0.0 to 3.0.1
...
Bumps [responders](https://github.com/heartcombo/responders ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/heartcombo/responders/releases )
- [Changelog](https://github.com/heartcombo/responders/blob/master/CHANGELOG.md )
- [Commits](https://github.com/heartcombo/responders/compare/v3.0.0...v3.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-01 10:37:26 +00:00
dependabot-preview[bot]
8c2cd4c953
Bump faker from 2.11.0 to 2.12.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.11.0 to 2.12.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.11.0...v2.12.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-01 10:36:21 +00:00
dependabot-preview[bot]
9d171c6c84
Bump webdrivers from 4.3.0 to 4.4.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.3.0 to 4.4.0.
- [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.3.0...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-01 10:35:32 +00:00
Brenda Wallace
68694aa3c4
Gem upgrades
2020-06-01 14:08:05 +12:00
Brenda Wallace
61853a2584
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
Gemfile.lock
2020-06-01 14:04:38 +12:00
codefactor-io
0577dce474
[CodeFactor] Apply fixes
2020-06-01 14:02:34 +12:00
Brenda Wallace
cdd00e7372
Only allow get
2020-06-01 14:02:34 +12:00
Brenda Wallace
5600670fef
Only allow open CORS on the api
2020-06-01 14:02:34 +12:00
Brenda Wallace
32972a90fd
Removed commented out code
2020-06-01 14:02:34 +12:00
Brenda Wallace
048ec7791f
Increase max records on jsonapi to 100
2020-06-01 14:02:34 +12:00
Brenda Wallace
7482095894
CORS headers for an open api
2020-06-01 14:02:34 +12:00
dependabot-preview[bot]
5abd0578fd
Bump font-awesome-sass from 5.12.0 to 5.13.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.12.0 to 5.13.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-31 11:17:52 +12:00
Daniel O'Connor
3a2ba7b152
Merge pull request #2541 from Growstuff/dependabot/bundler/capybara-3.32.2
...
Bump capybara from 3.32.1 to 3.32.2
2020-05-28 22:23:18 +09:30
Daniel O'Connor
7b589903fa
Merge pull request #2546 from Growstuff/dependabot/bundler/rspec-rails-4.0.1
...
Bump rspec-rails from 4.0.0 to 4.0.1
2020-05-28 22:22:12 +09:30
dependabot-preview[bot]
38c69853a9
Bump rspec-rails from 4.0.0 to 4.0.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.0...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-26 08:41:40 +00:00
dependabot-preview[bot]
7e5119b6f9
Bump database_cleaner from 1.8.4 to 1.8.5
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.4 to 1.8.5.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.8.5/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.4...v1.8.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-25 16:33:30 +12:00
dependabot-preview[bot]
d824002e8a
Bump capybara from 3.32.1 to 3.32.2
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.1 to 3.32.2.
- [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.32.1...3.32.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 03:42:16 +00:00
dependabot-preview[bot]
579a8c5250
Merge pull request #2538 from Growstuff/dependabot/bundler/searchkick-4.3.1
2020-05-23 03:40:22 +00:00
dependabot-preview[bot]
4b9c2c8b6c
Bump searchkick from 4.3.0 to 4.3.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.3.0 to 4.3.1.
- [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.3.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 02:55:48 +00:00
dependabot-preview[bot]
0c0bd202cf
Merge pull request #2537 from Growstuff/dependabot/bundler/better_errors-2.7.1
2020-05-23 02:53:54 +00:00
dependabot-preview[bot]
93125138f2
Bump better_errors from 2.6.0 to 2.7.1
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.6.0 to 2.7.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.6.0...v2.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 01:56:01 +00:00
dependabot-preview[bot]
bd583ad788
Merge pull request #2534 from Growstuff/dependabot/bundler/jquery-rails-4.4.0
2020-05-23 01:54:08 +00:00
dependabot-preview[bot]
8c59b6798e
Bump jquery-rails from 4.3.5 to 4.4.0
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 4.3.5 to 4.4.0.
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v4.3.5...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 01:26:47 +00:00
dependabot-preview[bot]
787fac21e6
Merge pull request #2539 from Growstuff/dependabot/bundler/rubocop-0.84.0
2020-05-23 01:25:01 +00:00
dependabot-preview[bot]
03254852e2
Bump rubocop from 0.81.0 to 0.84.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.81.0 to 0.84.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.81.0...v0.84.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 23:06:02 +00:00
dependabot-preview[bot]
6ca5ed3256
Merge pull request #2536 from Growstuff/dependabot/bundler/figaro-1.2.0
2020-05-22 23:03:21 +00:00
dependabot-preview[bot]
b0865dd9ad
Bump figaro from 1.1.1 to 1.2.0
...
Bumps [figaro](https://github.com/laserlemon/figaro ) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/laserlemon/figaro/releases )
- [Changelog](https://github.com/laserlemon/figaro/blob/master/CHANGELOG.md )
- [Commits](https://github.com/laserlemon/figaro/compare/v1.1.1...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 21:37:09 +00:00
dependabot-preview[bot]
c924484149
Merge pull request #2542 from Growstuff/dependabot/bundler/validate_url-1.0.11
2020-05-22 21:35:07 +00:00
dependabot-preview[bot]
7ec4265d56
Bump validate_url from 1.0.8 to 1.0.11
...
Bumps [validate_url](https://github.com/perfectline/validates_url ) from 1.0.8 to 1.0.11.
- [Release notes](https://github.com/perfectline/validates_url/releases )
- [Commits](https://github.com/perfectline/validates_url/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 20:46:55 +00:00
dependabot-preview[bot]
d65984e91b
Merge pull request #2544 from Growstuff/dependabot/bundler/bootstrap-4.5.0
2020-05-22 20:44:44 +00:00
dependabot-preview[bot]
7642bb8554
Bump bootstrap from 4.4.1 to 4.5.0
...
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.4.1 to 4.5.0.
- [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.4.1...v4.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 19:49:46 +00:00
dependabot-preview[bot]
cadef2746e
Bump puma from 4.3.3 to 4.3.5
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
f67ba83d86
Bump unicorn from 5.5.4 to 5.5.5
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.4 to 5.5.5.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
6d4f4fa662
Bump rubocop-rspec from 1.38.1 to 1.39.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.38.1 to 1.39.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.38.1...v1.39.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
15e656700a
Bump byebug from 11.1.1 to 11.1.3
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.1.1 to 11.1.3.
- [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.1.1...v11.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
84b587358b
Bump sidekiq from 6.0.6 to 6.0.7
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.6 to 6.0.7.
- [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.6...v6.0.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
a338a27d4c
Bump bootstrap_form from 4.4.0 to 4.5.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.4.0 to 4.5.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.4.0...v4.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
bc36f8b48b
Bump rswag-specs from 2.2.0 to 2.3.1
...
Bumps [rswag-specs](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Awesome Code
ad1d3738a8
Auto corrected by following Lint Ruby Layout/EmptyLineAfterMagicComment
2020-05-23 07:48:28 +12:00
Awesome Code
c2e66b9dac
Auto corrected by following Lint Ruby Lint/RedundantCopEnableDirective
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c6643fbf7c
Bump webdrivers from 4.2.0 to 4.3.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.2.0 to 4.3.0.
- [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.2.0...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Awesome Code
5816b13244
Auto corrected by following Lint Ruby Lint/RedundantCopDisableDirective
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
660b77cbc0
Bump rswag-api from 2.2.0 to 2.3.1
...
Bumps [rswag-api](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
481c339f12
Bump rswag-ui from 2.2.0 to 2.3.1
...
Bumps [rswag-ui](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c3bdeb9c6a
Bump loofah from 2.4.0 to 2.5.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.4.0 to 2.5.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.4.0...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
61f164db0e
Bump capybara from 3.32.0 to 3.32.1
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.0 to 3.32.1.
- [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.32.0...3.32.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Brenda Wallace
bfc495c6f6
Updating codeclimate to look at scss filesl
2020-05-23 07:48:28 +12:00
Brenda Wallace
3d26b4b120
Removing ignores in codeclimate config
2020-05-23 07:48:28 +12:00
Brenda Wallace
4362b80d1e
Adding scss lint config
2020-05-23 07:48:28 +12:00
Brenda Wallace
12e08494d1
Bumping rubocop to 0.81
2020-05-23 07:48:28 +12:00
Awesome Code
923e2f07bc
Auto corrected by following Lint Ruby RSpec/ExampleWording
2020-05-23 07:48:28 +12:00
Awesome Code
83462275e7
Auto corrected by following Lint Ruby Rails/HttpStatus
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
b5c17f472f
Bump oj from 3.10.5 to 3.10.6
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.5 to 3.10.6.
- [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.5...v3.10.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Awesome Code
593059d4aa
Auto corrected by following Lint Ruby Capybara/CurrentPathExpectation
2020-05-23 07:48:28 +12:00
Awesome Code
4c0899790a
Auto corrected by following Lint Ruby RSpec/NotToNot
2020-05-23 07:48:28 +12:00
Awesome Code
b8c3a95e1a
Auto corrected by following Lint Ruby RSpec/SharedContext
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
dae8922ca1
Bump rubocop-rails from 2.5.1 to 2.5.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.5.1 to 2.5.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.1...v2.5.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
a93a5f2c29
Bump database_cleaner from 1.8.3 to 1.8.4
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.3 to 1.8.4.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.3...v1.8.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
2a31f628e7
Bump rubocop-rails from 2.4.2 to 2.5.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
aec1f0a543
Bump rubocop from 0.80.1 to 0.81.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.80.1 to 0.81.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.80.1...v0.81.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
24c4697ae5
Bump capybara from 3.31.0 to 3.32.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.31.0 to 3.32.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.31.0...3.32.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c479bb5ba3
Bump faker from 2.10.2 to 2.11.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.2 to 2.11.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.10.2...v2.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
57b71e3f89
Bump sidekiq from 6.0.5 to 6.0.6
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.5 to 6.0.6.
- [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.5...v6.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
19ac81d929
Bump unicorn from 5.5.3 to 5.5.4
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.3 to 5.5.4.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
4d232379b2
Bump rspec-rails from 3.9.1 to 4.0.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
3121db42e3
[Security] Bump json from 2.2.0 to 2.3.0
...
Bumps [json](https://github.com/flori/json ) from 2.2.0 to 2.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/flori/json/releases )
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md )
- [Commits](https://github.com/flori/json/compare/v2.2.0...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
e5cda2b969
Bump scout_apm from 2.6.6 to 2.6.7
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.6 to 2.6.7.
- [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.6...v2.6.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
83bd9d7f01
Bump cancancan from 3.0.2 to 3.1.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
1bf244d7a7
Bump rspec-rails from 3.9.0 to 3.9.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
b2053d81d9
Bump bootstrap_form from 4.3.0 to 4.4.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.3.0 to 4.4.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.3.0...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c3cde1b2df
Bump i18n-tasks from 0.9.30 to 0.9.31
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
4f006aece6
Bump oj from 3.10.2 to 3.10.5
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.2 to 3.10.5.
- [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.2...v3.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
b0d01e96ca
Bump hashie from 3.6.0 to 4.1.0
...
Bumps [hashie](https://github.com/hashie/hashie ) from 3.6.0 to 4.1.0.
- [Release notes](https://github.com/hashie/hashie/releases )
- [Changelog](https://github.com/hashie/hashie/blob/master/CHANGELOG.md )
- [Commits](https://github.com/hashie/hashie/compare/v3.6.0...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c27a70f72d
Bump leaflet-rails from 1.5.1 to 1.6.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.5.1...v1.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Awesome Code
d9eb96b8f7
Auto corrected by following Lint Ruby RSpec/HookArgument
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
831b41bc23
Bump puma from 4.3.3 to 4.3.5
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:47:43 +12:00
dependabot-preview[bot]
d568e25299
Merge pull request #2528 from Growstuff/dependabot/bundler/unicorn-5.5.5
2020-05-22 06:13:13 +00:00
dependabot-preview[bot]
859a12dda6
Bump unicorn from 5.5.4 to 5.5.5
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.4 to 5.5.5.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 04:58:52 +00:00
dependabot-preview[bot]
183b700e4d
Merge pull request #2532 from Growstuff/dependabot/bundler/rubocop-rspec-1.39.0
2020-05-22 04:56:32 +00:00
dependabot-preview[bot]
da61c25ed5
Bump rubocop-rspec from 1.38.1 to 1.39.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.38.1 to 1.39.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.38.1...v1.39.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 03:49:56 +00:00
dependabot-preview[bot]
f42a496434
Merge pull request #2526 from Growstuff/dependabot/bundler/byebug-11.1.3
2020-05-22 03:47:38 +00:00
dependabot-preview[bot]
f4e05f96be
Bump byebug from 11.1.1 to 11.1.3
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.1.1 to 11.1.3.
- [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.1.1...v11.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 03:19:33 +00:00
dependabot-preview[bot]
356f5fee84
Bump sidekiq from 6.0.6 to 6.0.7
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.6 to 6.0.7.
- [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.6...v6.0.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 15:17:19 +12:00
dependabot-preview[bot]
df63a7a7d6
Bump bootstrap_form from 4.4.0 to 4.5.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.4.0 to 4.5.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.4.0...v4.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-13 12:45:17 +12:00
dependabot-preview[bot]
f19fc1bb1b
Bump rswag-specs from 2.2.0 to 2.3.1
...
Bumps [rswag-specs](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-16 15:49:32 +12:00
Awesome Code
8cd0628ba6
Auto corrected by following Lint Ruby Layout/EmptyLineAfterMagicComment
2020-04-16 13:59:48 +12:00
Awesome Code
f570557ddb
Auto corrected by following Lint Ruby Lint/RedundantCopEnableDirective
2020-04-16 13:59:32 +12:00
dependabot-preview[bot]
5f3e15cc44
Bump webdrivers from 4.2.0 to 4.3.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.2.0 to 4.3.0.
- [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.2.0...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-16 13:59:11 +12:00
Awesome Code
c764b0a28f
Auto corrected by following Lint Ruby Lint/RedundantCopDisableDirective
2020-04-14 10:49:54 +12:00
dependabot-preview[bot]
e01d47863f
Bump rswag-api from 2.2.0 to 2.3.1
...
Bumps [rswag-api](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 10:47:40 +12:00
dependabot-preview[bot]
f544a2e03c
Bump rswag-ui from 2.2.0 to 2.3.1
...
Bumps [rswag-ui](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 10:47:24 +12:00
dependabot-preview[bot]
5a0684a60a
Bump loofah from 2.4.0 to 2.5.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.4.0 to 2.5.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.4.0...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 10:47:10 +12:00
dependabot-preview[bot]
8fd5fd1a03
Bump capybara from 3.32.0 to 3.32.1
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.0 to 3.32.1.
- [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.32.0...3.32.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 10:46:56 +12:00
Brenda Wallace
74738a340d
Updating codeclimate to look at scss filesl
2020-04-14 10:46:42 +12:00
Brenda Wallace
d90eb5d7c7
Removing ignores in codeclimate config
2020-04-14 10:46:42 +12:00
Brenda Wallace
a185d39eff
Adding scss lint config
2020-04-14 10:46:42 +12:00
Brenda Wallace
54e4c52dc0
Bumping rubocop to 0.81
2020-04-14 10:46:42 +12:00
Awesome Code
8b2fc2fb0b
Auto corrected by following Lint Ruby RSpec/ExampleWording
2020-04-14 09:07:08 +12:00
Awesome Code
74a8e1c54f
Auto corrected by following Lint Ruby Rails/HttpStatus
2020-04-14 09:06:46 +12:00
dependabot-preview[bot]
08caa2ed32
Bump oj from 3.10.5 to 3.10.6
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.5 to 3.10.6.
- [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.5...v3.10.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 09:06:24 +12:00
Awesome Code
59d2096df1
Auto corrected by following Lint Ruby Capybara/CurrentPathExpectation
2020-04-14 09:06:01 +12:00
Awesome Code
f6b16f5f65
Auto corrected by following Lint Ruby RSpec/NotToNot
2020-04-14 09:05:30 +12:00
Awesome Code
6d1137818d
Auto corrected by following Lint Ruby RSpec/SharedContext
2020-04-14 09:04:17 +12:00
dependabot-preview[bot]
f1cbe130bd
Bump rubocop-rails from 2.5.1 to 2.5.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.5.1 to 2.5.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.1...v2.5.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-13 11:43:19 +12:00
dependabot-preview[bot]
0fd0e55eb2
Bump database_cleaner from 1.8.3 to 1.8.4
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.3 to 1.8.4.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.3...v1.8.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-09 15:10:56 +12:00
dependabot-preview[bot]
58eef2ee9c
Merge pull request #2480 from Growstuff/dependabot/bundler/rubocop-rails-2.5.1
2020-04-05 01:45:56 +00:00
dependabot-preview[bot]
313e611ded
Bump rubocop-rails from 2.4.2 to 2.5.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-05 01:23:28 +00:00
dependabot-preview[bot]
55583947ca
Merge pull request #2479 from Growstuff/dependabot/bundler/rubocop-0.81.0
2020-04-05 01:21:38 +00:00
dependabot-preview[bot]
169c5e49f6
Bump rubocop from 0.80.1 to 0.81.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.80.1 to 0.81.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.80.1...v0.81.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-05 00:59:54 +00:00
dependabot-preview[bot]
6d19471a03
Bump capybara from 3.31.0 to 3.32.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.31.0 to 3.32.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.31.0...3.32.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-05 12:58:03 +12:00
dependabot-preview[bot]
8fffcf6357
Merge pull request #2476 from Growstuff/dependabot/bundler/faker-2.11.0
2020-03-26 23:30:12 +00:00
dependabot-preview[bot]
3d23ce571a
Bump faker from 2.10.2 to 2.11.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.2 to 2.11.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.10.2...v2.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-26 23:05:14 +00:00
dependabot-preview[bot]
ff0e4eef86
Merge pull request #2474 from Growstuff/dependabot/bundler/sidekiq-6.0.6
2020-03-26 23:03:16 +00:00
dependabot-preview[bot]
bc3cb466ca
Bump sidekiq from 6.0.5 to 6.0.6
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.5 to 6.0.6.
- [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.5...v6.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-26 22:18:37 +00:00
dependabot-preview[bot]
2f798a9026
Merge pull request #2475 from Growstuff/dependabot/bundler/unicorn-5.5.4
2020-03-26 22:16:51 +00:00
dependabot-preview[bot]
e05be935e8
Bump unicorn from 5.5.3 to 5.5.4
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.3 to 5.5.4.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-26 21:49:47 +00:00
dependabot-preview[bot]
77ea202e2e
Bump rspec-rails from 3.9.1 to 4.0.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-27 10:47:59 +13:00
dependabot-preview[bot]
3d7b6f5a1f
[Security] Bump json from 2.2.0 to 2.3.0
...
Bumps [json](https://github.com/flori/json ) from 2.2.0 to 2.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/flori/json/releases )
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md )
- [Commits](https://github.com/flori/json/compare/v2.2.0...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-21 18:16:18 +13:00
dependabot-preview[bot]
44a66ba3f2
Bump scout_apm from 2.6.6 to 2.6.7
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.6 to 2.6.7.
- [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.6...v2.6.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-19 10:50:47 +13:00
dependabot-preview[bot]
a07235bea0
Bump cancancan from 3.0.2 to 3.1.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-17 07:16:39 +13:00
dependabot-preview[bot]
82146ea835
Bump rspec-rails from 3.9.0 to 3.9.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-12 00:07:19 +13:00
dependabot-preview[bot]
2990c31245
Merge pull request #2467 from Growstuff/dependabot/bundler/bootstrap_form-4.4.0
2020-03-10 09:58:27 +00:00
dependabot-preview[bot]
f81538b873
Bump bootstrap_form from 4.3.0 to 4.4.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.3.0 to 4.4.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.3.0...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-10 09:37:35 +00:00
dependabot-preview[bot]
cbe75903fe
Bump i18n-tasks from 0.9.30 to 0.9.31
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-10 22:35:30 +13:00
dependabot-preview[bot]
6a1a2d3094
Bump oj from 3.10.2 to 3.10.5
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.2 to 3.10.5.
- [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.2...v3.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-08 10:52:12 +13:00
dependabot-preview[bot]
d8aa9a8839
Merge pull request #2464 from Growstuff/dependabot/bundler/hashie-4.1.0
2020-03-06 08:13:29 +00:00
dependabot-preview[bot]
6cef7ef167
Bump hashie from 3.6.0 to 4.1.0
...
Bumps [hashie](https://github.com/hashie/hashie ) from 3.6.0 to 4.1.0.
- [Release notes](https://github.com/hashie/hashie/releases )
- [Changelog](https://github.com/hashie/hashie/blob/master/CHANGELOG.md )
- [Commits](https://github.com/hashie/hashie/compare/v3.6.0...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-06 07:50:23 +00:00
Brenda Wallace
e6d26d5d21
Merge pull request #2466 from Growstuff/dependabot/bundler/leaflet-rails-1.6.0
...
Bump leaflet-rails from 1.5.1 to 1.6.0
2020-03-06 20:48:28 +13:00
dependabot-preview[bot]
4fd0924194
Bump leaflet-rails from 1.5.1 to 1.6.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.5.1...v1.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-05 08:04:45 +00:00
Brenda Wallace
6e9babd1ca
Merge pull request #2463 from Growstuff/awesomecode-lint-ruby-rspec-hookargument-43686
...
Auto corrected by following Lint Ruby RSpec/HookArgument
2020-03-04 14:58:45 +13:00
Brenda Wallace
36e24c9b64
Merge pull request #2459 from Growstuff/dev
...
Production release
2020-03-04 14:57:28 +13:00
Awesome Code
132a961008
Auto corrected by following Lint Ruby RSpec/HookArgument
2020-03-04 00:37:36 +00:00
dependabot-preview[bot]
9dc7c289bd
Merge pull request #2455 from Growstuff/dependabot/bundler/haml_lint-0.35.0
2020-03-04 00:34:17 +00:00
dependabot-preview[bot]
0bc84f885c
Bump haml_lint from 0.34.2 to 0.35.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.34.2 to 0.35.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.34.2...v0.35.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-03 23:18:27 +00:00
Brenda Wallace
85a645822a
disable percy
2020-03-04 11:35:15 +13:00
Brenda Wallace
917ec11b80
Merge pull request #2461 from Growstuff/awesomecode-lint-ruby-rspec-describedclass-43668
...
Auto corrected by following Lint Ruby RSpec/DescribedClass
2020-03-04 11:33:47 +13:00
Brenda Wallace
d4fb4e79a1
Merge pull request #2454 from Growstuff/dependabot/bundler/rubocop-0.80.1
...
Bump rubocop from 0.80.0 to 0.80.1
2020-03-04 11:33:14 +13:00
Awesome Code
4cbe6ca244
Auto corrected by following Lint Ruby RSpec/DescribedClass
2020-03-03 22:33:13 +00:00
Brenda Wallace
c4732fbda4
bump codeclimate to 0.80
2020-03-04 11:32:48 +13:00
dependabot-preview[bot]
244b62f0d8
Bump rubocop from 0.80.0 to 0.80.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.80.0 to 0.80.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.80.0...v0.80.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-03 22:31:56 +00:00
Brenda Wallace
a6bb63d1b3
Merge pull request #2458 from Growstuff/dependabot/bundler/omniauth-1.9.1
...
[Security] Bump omniauth from 1.9.0 to 1.9.1
2020-03-04 11:30:01 +13:00
dependabot-preview[bot]
4fd73589be
[Security] Bump omniauth from 1.9.0 to 1.9.1
...
Bumps [omniauth](https://github.com/omniauth/omniauth ) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases )
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-03 07:58:20 +00:00
Brenda Wallace
a1f130fb54
Merge pull request #2451 from Growstuff/dependabot/bundler/puma-4.3.3
...
[Security] Bump puma from 4.3.2 to 4.3.3
2020-03-03 15:24:17 +13:00
Brenda Wallace
88ae62fef4
Merge pull request #2453 from Br3nda/fix/member-link
...
BUGFIX: member slug needed on photos, to make link
2020-03-03 15:23:42 +13:00
Brenda Wallace
55147391f3
Merge pull request #2457 from Br3nda/fix/image-in-email
...
Fix/image in email
2020-03-03 15:23:23 +13:00
Brenda Wallace
89400e7677
Send reminder on mondays
2020-03-03 11:37:30 +13:00
Brenda Wallace
b61f6dd54d
Added link to profile page
2020-03-03 11:35:08 +13:00
Brenda Wallace
e8e5c936d5
Remove broken image from planting reminder
2020-03-03 11:33:59 +13:00
Brenda Wallace
0ae2aeb4a7
Apply suggestions from code review
...
Use delegated attributes
2020-03-02 15:51:29 +13:00
Brenda Wallace
9fa3f36436
BUGFUX: member slug needed on photos, to make link
2020-03-02 15:01:34 +13:00
Brenda Wallace
35f8289b06
Turn off caching on modal form
2020-03-02 12:53:29 +13:00
dependabot-preview[bot]
bc8447f3a4
[Security] Bump puma from 4.3.2 to 4.3.3
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.2 to 4.3.3. **This update includes a security fix.**
- [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.3.2...v4.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-01 23:30:49 +00:00
Brenda Wallace
a864a018d5
Fix icon images
2020-03-02 12:27:57 +13:00
Brenda Wallace
9594c2a63f
Always show photos on harvests
2020-03-02 12:22:48 +13:00
Brenda Wallace
bb7a9b17c6
Merge remote-tracking branch 'upstream/dev'
2020-03-02 12:22:15 +13:00
Brenda Wallace
3c14496936
BUGFIX - caching on harvest form
2020-03-02 12:22:00 +13:00
Brenda Wallace
f4a39b1fd4
Merge pull request #2450 from Growstuff/dev
...
Production release
2020-03-02 12:16:03 +13:00
Brenda Wallace
7a48b099aa
Merge pull request #2449 from Growstuff/imgbot
...
[ImgBot] Optimize images
2020-03-02 11:52:12 +13:00
ImgBotApp
d33db24f3c
[ImgBot] Optimize images
...
*Total -- 7.73kb -> 7.71kb (0.24%)
/app/assets/images/icons/plant_parts/other.svg -- 0.96kb -> 0.96kb (0.41%)
/app/assets/images/icons/plant_parts/seed.svg -- 1.86kb -> 1.86kb (0.26%)
/app/assets/images/icons/plant_parts/stem.svg -- 2.29kb -> 2.28kb (0.21%)
/app/assets/images/icons/plant_parts/root.svg -- 2.62kb -> 2.62kb (0.19%)
Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com >
2020-03-01 22:50:49 +00:00
Brenda Wallace
8e7ae445d7
Merge pull request #2442 from Growstuff/dependabot/bundler/active_utils-3.3.17
...
Bump active_utils from 3.3.16 to 3.3.17
2020-03-02 11:50:30 +13:00
Brenda Wallace
bf4d1afe99
Merge pull request #2443 from Br3nda/feature/crop-action-modals
...
Harvesting, planting and seed saving modal forms
2020-03-02 11:50:11 +13:00
Brenda Wallace
85d473d65c
Adding descriptions
2020-03-02 11:49:50 +13:00
Brenda Wallace
4a23bcefd1
Tests tradeable and not tradeable seed saving
2020-03-02 10:21:54 +13:00
Brenda Wallace
9955d26c1b
Added options from seed saving form to spec
2020-03-01 08:48:21 +13:00
Brenda
f13bc44e7e
update link labels in spec
2020-03-01 08:33:04 +13:00
Brenda
5c7b8254b0
plant_part is on harvest not planting
2020-03-01 08:32:53 +13:00
Brenda
7039240bdc
always show photos section on harvests
2020-03-01 07:57:19 +13:00
Brenda
cc83cb23bc
fix plant part selection bug on editing harvests
2020-03-01 07:57:04 +13:00
Brenda
88ac147dda
Restore old labels on buttons
2020-03-01 07:56:34 +13:00
Brenda
ef2820eb8c
fix deprecation warning from faker
2020-03-01 07:56:02 +13:00
Brenda
7e42d84a21
group crop actions in to button bar
2020-03-01 07:55:47 +13:00
Brenda Wallace
0fdbac5bc3
Update plant_parts.rb
2020-02-29 23:01:00 +13:00
Brenda Wallace
46220b8275
Update plant_parts.rb
2020-02-29 22:01:02 +13:00
Brenda Wallace
4e093716f2
Add number on the end
2020-02-29 21:30:08 +13:00
Brenda Wallace
52e28f4ae2
Link new harvest to planting
2020-02-29 20:07:30 +13:00
Brenda Wallace
f4acbaa89a
Use pokemon for plant parts
2020-02-29 19:53:39 +13:00
Brenda
c099580b70
Update link in spec
2020-02-29 19:49:57 +13:00
Brenda
3c392d43ee
Crop#show with seeds modal
2020-02-29 19:49:49 +13:00
Brenda
bb400dabda
Add new garden button on modal planting form
2020-02-29 13:37:27 +13:00
Brenda
43180bd6cb
unique plantpart names in factory bot
2020-02-29 13:26:51 +13:00
Brenda
f3cd341659
add an id to the harvest modal so the test can find it
2020-02-29 13:26:36 +13:00
Brenda
fd80fc98f1
use a default icon if no plant_part icon
2020-02-29 13:26:20 +13:00
Brenda Wallace
d0154a8b60
Fall back on planting icon when plant part icon does not exist
2020-02-29 12:34:28 +13:00
Brenda
cbec6b2743
Remove harvest button from crop info card until we can distinguish between it and the planting crop button
2020-02-29 12:20:53 +13:00
Brenda Wallace
b5f7156677
Makes sure factorybot plant names point to images that exist
2020-02-29 12:09:26 +13:00
Brenda
1503b39ad3
Seed saving modal
2020-02-29 11:19:19 +13:00
Brenda Wallace
97208b99c5
Plantings modal form on crops#show
2020-02-29 10:28:32 +13:00
Brenda Wallace
777877ab06
Added plantings modal button to crop info card
2020-02-29 10:25:45 +13:00
Brenda Wallace
6c94337047
Added Plantings modal form
2020-02-29 10:23:00 +13:00
Brenda Wallace
68d157b048
Removed extra harvest button on plantings#show
2020-02-29 10:22:46 +13:00
Brenda Wallace
8dd47e0639
Added harvest button to crop info card
2020-02-29 10:09:06 +13:00
dependabot-preview[bot]
952a97f5a5
Bump puma from 4.3.1 to 4.3.2
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.1 to 4.3.2.
- [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.3.1...v4.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
f58732bcab
Bump will_paginate from 3.2.1 to 3.3.0
...
Bumps [will_paginate](https://github.com/mislav/will_paginate ) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mislav/will_paginate/releases )
- [Commits](https://github.com/mislav/will_paginate/compare/v3.2.1...v3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
720a0fa645
Bump better_errors from 2.5.1 to 2.6.0
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
af1948f95c
[Security] Bump nokogiri from 1.10.7 to 1.10.8
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.7 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
f7013658a5
Bump database_cleaner from 1.8.2 to 1.8.3
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.8.3/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.2...v1.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
Brenda Wallace
a6ce1e05cf
Lower case in form title
2020-02-29 10:02:47 +13:00
Brenda
8955aab2bb
caching plant parts
2020-02-29 09:59:44 +13:00
Brenda Wallace
5d43575eae
Merge branch 'feature/crop-action-modals' of github.com:Br3nda/growstuff into feature/crop-action-modals
...
Conflicts:
app/views/harvests/_modal.html.haml
2020-02-29 09:38:21 +13:00
Brenda Wallace
5444d15242
Merge branch 'dev' into feature/crop-action-modals
2020-02-29 09:36:36 +13:00
dependabot-preview[bot]
63c28b3b18
Bump active_utils from 3.3.16 to 3.3.17
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.16 to 3.3.17.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.16...v3.3.17 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-28 20:36:24 +00:00
Brenda Wallace
b2ff247a31
Apply suggestions from code review
...
Co-Authored-By: Martina <922964+simicic@users.noreply.github.com >
2020-02-29 09:36:05 +13:00
dependabot-preview[bot]
011ce39edb
Bump puma from 4.3.1 to 4.3.2
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.1 to 4.3.2.
- [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.3.1...v4.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 09:34:25 +13:00
Brenda
d2509afca2
Harvest button on plantings
2020-02-29 09:33:40 +13:00
dependabot-preview[bot]
236caa0d32
Bump will_paginate from 3.2.1 to 3.3.0
...
Bumps [will_paginate](https://github.com/mislav/will_paginate ) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mislav/will_paginate/releases )
- [Commits](https://github.com/mislav/will_paginate/compare/v3.2.1...v3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-28 10:21:28 +13:00
dependabot-preview[bot]
1c57e5266f
Bump better_errors from 2.5.1 to 2.6.0
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-28 07:16:42 +13:00
Brenda Wallace
a5c770c2b5
Update app/views/crops/_thumbnail.html.haml
...
Co-Authored-By: Martina <922964+simicic@users.noreply.github.com >
2020-02-27 09:42:09 +13:00
Brenda Wallace
33091fbadc
Merge branch 'dev' into feature/crop-action-modals
2020-02-26 11:38:38 +13:00
Brenda Wallace
94d92f8748
Merge pull request #2441 from Growstuff/dependabot/bundler/nokogiri-1.10.8
...
[Security] Bump nokogiri from 1.10.7 to 1.10.8
2020-02-25 11:40:26 +13:00
dependabot-preview[bot]
e54330a4d7
[Security] Bump nokogiri from 1.10.7 to 1.10.8
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.7 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-24 19:47:44 +00:00
Brenda
9abb84ccba
Harvesting modal form
2020-02-24 11:51:37 +13:00
Brenda Wallace
9eba58839d
Merge pull request #2431 from Growstuff/dependabot/bundler/database_cleaner-1.8.3
...
Bump database_cleaner from 1.8.2 to 1.8.3
2020-02-23 20:01:34 +13:00
Brenda Wallace
92aa827df9
Merge pull request #2440 from Growstuff/dev
...
Production release
2020-02-23 20:01:10 +13:00
Brenda Wallace
a4a3745d90
Merge branch 'master' into dev
2020-02-23 17:12:18 +13:00
dependabot-preview[bot]
5bd97902da
Bump database_cleaner from 1.8.2 to 1.8.3
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.8.3/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.2...v1.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-23 04:05:47 +00:00
Brenda Wallace
edb3529d2d
Merge pull request #2430 from Growstuff/dependabot/bundler/rubocop-0.80.0
...
Bump rubocop from 0.79.0 to 0.80.0
2020-02-23 17:04:23 +13:00
Brenda Wallace
676596191d
Merge pull request #2439 from Br3nda/tidy-members
...
Tidy members profile page
2020-02-23 17:03:58 +13:00
Brenda
435c164e15
Fixed typo error in view
2020-02-23 15:47:23 +13:00
codefactor-io
28ff058366
[CodeFactor] Apply fixes
2020-02-22 23:04:59 +00:00
Brenda Wallace
7e13431c27
Merge remote-tracking branch 'upstream/dev' into tidy-members
...
Conflicts:
app/views/members/_full_summary.html.haml
2020-02-23 12:04:20 +13:00
Brenda Wallace
71ccd52c59
Fix harvest thumbnails
2020-02-23 12:03:14 +13:00
Brenda
36bad1cda0
Fix mobile display of member profiles
2020-02-23 11:42:07 +13:00
dependabot-preview[bot]
bb13bbf27e
Bump rubocop from 0.79.0 to 0.80.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.79.0 to 0.80.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.79.0...v0.80.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-22 00:15:34 +00:00
dependabot-preview[bot]
cf440b444c
Bump searchkick from 4.2.1 to 4.3.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.2.1 to 4.3.0.
- [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.2.1...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-22 13:13:29 +13:00
Brenda Wallace
c85abe0bd1
Member planting progress ( #2437 )
...
* Show member plantings summary on member page
* Remove reference to current member
* Tidy up member planting progress section
2020-02-22 13:13:07 +13:00
Brenda Wallace
0177b872db
Member planting progress ( #2437 )
...
* Show member plantings summary on member page
* Remove reference to current member
* Tidy up member planting progress section
2020-02-22 12:29:02 +13:00
Brenda Wallace
9df084a859
Merge branch 'dev' into member-planting-progress
2020-02-22 07:51:30 +13:00
Brenda Wallace
878ae9073c
Tidy up member planting progress section
2020-02-22 07:49:56 +13:00
Brenda Wallace
6c9f6b7520
Merge pull request #2436 from Growstuff/dev
...
Production release
2020-02-21 16:38:04 +13:00
Brenda Wallace
c71e9b01de
Remove reference to current member
2020-02-21 15:56:59 +13:00
Brenda
e3594eee02
Show member plantings summary on member page
2020-02-21 15:56:59 +13:00
Brenda Wallace
b72e866362
Remove reference to current member
2020-02-21 14:40:53 +13:00
Brenda
d3cdaea218
Show member plantings summary on member page
2020-02-20 23:01:04 +13:00
Brenda
3ab67786e0
Wrapping the whole layout, to center the page
2020-02-20 22:39:12 +13:00
Brenda Wallace
325729751a
Move search bar to middle, hide sitename on small screens
2020-02-20 19:29:35 +13:00
Brenda Wallace
07a9891ec4
Fix spec
2020-02-20 19:29:35 +13:00
Brenda Wallace
e8c7a9e1f5
Fixed menu link label in another spec
2020-02-20 19:29:35 +13:00
Brenda Wallace
155f2ed548
Fix menu link label in spec
2020-02-20 19:29:35 +13:00
Brenda Wallace
76a3dcfc93
Added breadcrumbs to members
2020-02-20 19:29:35 +13:00
Brenda Wallace
63af7eca9f
Fix wrapping of admin menu, and put profile link (with image) last
2020-02-20 19:29:35 +13:00
Brenda Wallace
e986eafc0b
Move search bar to middle, hide sitename on small screens
2020-02-20 16:04:09 +13:00
Brenda Wallace
d4517bf298
Fix spec
2020-02-20 15:03:35 +13:00
Brenda Wallace
fe1eda3f30
Fixed menu link label in another spec
2020-02-20 15:03:35 +13:00
Brenda Wallace
0ca529ea8f
Fix menu link label in spec
2020-02-20 15:03:35 +13:00
Brenda Wallace
aa2893f666
Added breadcrumbs to members
2020-02-20 15:03:35 +13:00
Brenda Wallace
2006210d4e
Fix wrapping of admin menu, and put profile link (with image) last
2020-02-20 15:03:35 +13:00
Brenda Wallace
b208850b7d
Full width on mobile
2020-02-19 20:25:06 +13:00
Brenda Wallace
724ba246a3
More crops
2020-02-19 17:00:06 +13:00
Brenda Wallace
00a984a3a5
Removed cute icon that was making sections not line up
2020-02-19 16:59:13 +13:00
Brenda Wallace
bc59827009
Col for recent crops
2020-02-19 16:45:45 +13:00
Brenda Wallace
2208a35b2f
More space on home
2020-02-19 16:43:33 +13:00
Brenda Wallace
3764544965
Ten crops on home page
2020-02-19 16:27:03 +13:00
Brenda Wallace
495b52c2ef
Merge remote-tracking branch 'upstream/dev'
2020-02-19 16:26:29 +13:00
Brenda Wallace
a60a1ded32
Nine seeds on home page
2020-02-19 16:25:36 +13:00
dependabot-preview[bot]
b56cc37991
Merge pull request #2427 from Growstuff/dependabot/bundler/rubocop-rspec-1.38.1
2020-02-18 10:17:05 +00:00
dependabot-preview[bot]
899419a89f
Bump rubocop-rspec from 1.38.0 to 1.38.1
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.38.0 to 1.38.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.38.0...v1.38.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 09:50:25 +00:00
dependabot-preview[bot]
ae581d5361
Merge pull request #2428 from Growstuff/dependabot/bundler/faker-2.10.2
2020-02-18 09:48:00 +00:00
dependabot-preview[bot]
44e684611b
Bump faker from 2.10.1 to 2.10.2
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.1 to 2.10.2.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/commits/v2.10.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 09:24:21 +00:00
dependabot-preview[bot]
b6ec583b0f
Bump discard from 1.1.0 to 1.2.0
...
Bumps [discard](https://github.com/jhawthorn/discard ) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases )
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jhawthorn/discard/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 22:21:58 +13:00
dependabot-preview[bot]
94e06e4148
Bump sidekiq from 6.0.4 to 6.0.5
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.4 to 6.0.5.
- [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.4...v6.0.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-17 07:13:16 +13:00
Brenda Wallace
cf60a75480
Merge pull request #2426 from Growstuff/dev
...
Production release
2020-02-15 10:46:35 +13:00
Brenda
88615a55f4
CSS for seeds cards
2020-02-15 10:05:14 +13:00
Brenda Wallace
2eaf8ac215
Merge branch 'dev' of github.com:Growstuff/growstuff into dev
2020-02-15 10:05:03 +13:00
Brenda Wallace
7472bceeb3
install postgresql from addonns
2020-02-15 09:54:00 +13:00
Brenda Wallace
eb749c02fd
Turning off postgresql service on travis-ci
...
see if this fixes the build
2020-02-15 09:54:00 +13:00
Brenda Wallace
9853d931c6
Shrink seed card and fix links
2020-02-15 09:54:00 +13:00
Brenda Wallace
c12580ed8d
Shrink seed card and fix links
2020-02-14 10:07:26 +13:00
Brenda Wallace
4c603f0cc9
Merge pull request #2422 from Growstuff/dependabot/bundler/rubocop-rspec-1.38.0
...
Bump rubocop-rspec from 1.37.1 to 1.38.0
2020-02-13 21:33:30 +13:00
dependabot-preview[bot]
6e930976cb
Bump rubocop-rspec from 1.37.1 to 1.38.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.37.1 to 1.38.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.37.1...v1.38.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-12 07:51:54 +00:00
Brenda Wallace
35094561ce
Merge remote-tracking branch 'upstream/dev'
2020-02-12 16:42:30 +13:00
Brenda Wallace
9a6c6e73f1
Bump posts and members count to 6
2020-02-12 14:02:14 +13:00
Brenda Wallace
d6e4ab5fab
Merge branch 'index-pages' into dev
2020-02-10 21:49:58 +13:00
Brenda
24ae63a339
add link to gardens for members#show
2020-02-10 21:49:38 +13:00
Brenda
20e878e9fe
style "inactive" checkbox on gardens#index
2020-02-10 21:49:27 +13:00
Brenda Wallace
cb0a545358
Merge pull request #2421 from Growstuff/dev
...
production release
2020-02-10 14:57:35 +13:00
dependabot-preview[bot]
b5946b5c81
Bump haml_lint from 0.34.1 to 0.34.2
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.34.1 to 0.34.2.
- [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.34.1...v0.34.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-10 14:21:19 +13:00
Brenda
821ddd90cb
fix specs
2020-02-10 14:21:03 +13:00
Brenda
dcb05c2e1e
tidy up posts on crops page
2020-02-10 14:21:03 +13:00
Brenda
9dfd6dbc73
Tidy up index pages
2020-02-10 14:21:03 +13:00
Brenda
3a1f6c9d0b
fix specs
2020-02-10 11:12:44 +13:00
Brenda
f7f62bb7dc
tidy up posts on crops page
2020-02-10 10:03:49 +13:00
Brenda
12db6b5fa0
Tidy up index pages
2020-02-10 09:47:37 +13:00
Brenda Wallace
4543a64e3b
Merge pull request #2418 from Growstuff/dev
...
Production release
2020-02-09 23:20:09 +13:00
Brenda Wallace
abecbab6c5
Tidy up mobile display on homepage, including member cards changes ( #2417 )
...
* Tidy up mobile display on homepage, including member cards changes
2020-02-09 22:38:12 +13:00
Brenda Wallace
b4a5c5d0ad
Merge pull request #2416 from Growstuff/dev
...
production deploy
2020-02-07 22:01:18 +13:00
Brenda Wallace
4f5245f7e7
Show all of a harvest's photos on harvest#show
2020-02-07 08:02:20 +13:00
Brenda Wallace
d515aba4b5
Merge pull request #2414 from Growstuff/dev
...
Production deploy
2020-02-05 11:40:01 +13:00
Brenda Wallace
1d0a1baa2d
Merge pull request #2413 from Growstuff/dependabot/bundler/unicorn-5.5.3
...
Bump unicorn from 5.5.2 to 5.5.3
2020-02-05 10:37:10 +13:00
Brenda Wallace
cde46ed14a
Merge pull request #2411 from Growstuff/feature/photo-for-socmed
...
Feature/photo for socmed
2020-02-05 10:36:57 +13:00
dependabot-preview[bot]
697631dcce
Bump unicorn from 5.5.2 to 5.5.3
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.2 to 5.5.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 07:50:58 +00:00
Brenda Wallace
30f2d2c590
Merge branch 'dev' into feature/photo-for-socmed
2020-02-04 16:21:22 +13:00
Brenda Wallace
906f44ac66
Merge pull request #2412 from Growstuff/dev
...
production release
2020-02-04 16:21:11 +13:00
Brenda Wallace
5a3c06f490
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
Gemfile.lock
2020-02-04 12:44:28 +13:00
Brenda Wallace
019d94f1cb
Show the default photo for social media
2020-02-04 11:52:13 +13:00
dependabot-preview[bot]
8dd70486c7
Bump unicorn from 5.5.2 to 5.5.3
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.2 to 5.5.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 10:51:12 +13:00
dependabot-preview[bot]
425f801033
Bump database_cleaner from 1.8.1 to 1.8.2
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.1...v1.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 10:50:52 +13:00
dependabot-preview[bot]
cce29dabbb
Bump oj from 3.10.1 to 3.10.2
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.1 to 3.10.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.10.1...v3.10.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 10:50:17 +13:00
Martina Simicic
b0a5223d97
Account for finished planting when counting days of life
2020-02-04 10:50:00 +13:00
Martina Simicic
10008ca30d
Removing method since it is defined in predict planting
2020-02-04 10:50:00 +13:00
Brenda Wallace
d15df948ff
Added perennial to plantings
2020-02-03 16:28:57 +13:00
Brenda Wallace
5fbdd577d6
One per person on home page
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
42cce210c0
Bump database_cleaner from 1.7.0 to 1.8.1
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.7.0 to 1.8.1.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
42aeba9eeb
Bump searchkick from 4.2.0 to 4.2.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.2.0 to 4.2.1.
- [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.2.0...v4.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
a0e1184cda
Bump bootstrap-datepicker-rails from 1.8.0.1 to 1.9.0.1
...
Bumps [bootstrap-datepicker-rails](https://github.com/Nerian/bootstrap-datepicker-rails ) from 1.8.0.1 to 1.9.0.1.
- [Release notes](https://github.com/Nerian/bootstrap-datepicker-rails/releases )
- [Commits](https://github.com/Nerian/bootstrap-datepicker-rails/compare/1.8.0.1...1.9.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
530217552e
Bump capybara from 3.30.0 to 3.31.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.30.0 to 3.31.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.30.0...3.31.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
1d710abb77
Bump rubocop-rails from 2.4.1 to 2.4.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
Brenda Wallace
929049abad
Note about tech used
2020-02-03 16:28:57 +13:00
Brenda Wallace
fc1bd1893c
Added perennial to plantings
2020-02-03 15:06:45 +13:00
Brenda Wallace
7bf5ab2df3
One per person on home page
2020-02-03 11:54:26 +13:00
dependabot-preview[bot]
2c40027cb5
Bump database_cleaner from 1.7.0 to 1.8.1
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.7.0 to 1.8.1.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-02 11:29:30 +13:00
dependabot-preview[bot]
e1b57b8619
Merge pull request #2402 from Growstuff/dependabot/bundler/searchkick-4.2.1
2020-01-29 19:04:32 +00:00
dependabot-preview[bot]
c3190866b9
Bump searchkick from 4.2.0 to 4.2.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.2.0 to 4.2.1.
- [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.2.0...v4.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-29 18:33:46 +00:00
dependabot-preview[bot]
c546c0ad81
Bump bootstrap-datepicker-rails from 1.8.0.1 to 1.9.0.1
...
Bumps [bootstrap-datepicker-rails](https://github.com/Nerian/bootstrap-datepicker-rails ) from 1.8.0.1 to 1.9.0.1.
- [Release notes](https://github.com/Nerian/bootstrap-datepicker-rails/releases )
- [Commits](https://github.com/Nerian/bootstrap-datepicker-rails/compare/1.8.0.1...1.9.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-30 07:31:38 +13:00
Brenda Wallace
a19a2a6925
Merge pull request #2400 from Growstuff/dependabot/bundler/capybara-3.31.0
...
Bump capybara from 3.30.0 to 3.31.0
2020-01-29 10:48:33 +13:00
dependabot-preview[bot]
1975087611
Bump capybara from 3.30.0 to 3.31.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.30.0 to 3.31.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.30.0...3.31.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-28 07:20:12 +00:00
Brenda Wallace
1be2f342ba
Merge pull request #2399 from Growstuff/dependabot/bundler/rubocop-rails-2.4.2
...
Bump rubocop-rails from 2.4.1 to 2.4.2
2020-01-28 20:18:21 +13:00
dependabot-preview[bot]
827dda79d7
Bump rubocop-rails from 2.4.1 to 2.4.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-27 08:12:30 +00:00
Brenda Wallace
dfdbfbc118
Note about tech used
2020-01-25 18:57:32 +13:00
Brenda Wallace
253f7a66b1
Merge pull request #2398 from Growstuff/dev
...
Production release
2020-01-25 10:33:10 +13:00
Brenda Wallace
10c7f7eccb
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
Gemfile.lock
2020-01-25 10:09:03 +13:00
Brenda Wallace
793bc17692
Fix owner name in harvests on homepage
2020-01-25 08:12:21 +13:00
Brenda Wallace
d2d2c5f685
Fixed planting owner name on homepage
2020-01-25 08:11:41 +13:00
dependabot-preview[bot]
9f3d59e0e4
Merge pull request #2397 from Growstuff/dependabot/bundler/byebug-11.1.1
2020-01-24 08:01:09 +00:00
dependabot-preview[bot]
944ff39d95
Bump byebug from 11.1.0 to 11.1.1
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.1.0 to 11.1.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.1.0...v11.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-24 07:41:00 +00:00
dependabot-preview[bot]
1e9914dd0b
Merge pull request #2396 from Growstuff/dependabot/bundler/elasticsearch-6.8.1
2020-01-23 07:58:26 +00:00
dependabot-preview[bot]
5ffcb93807
Bump elasticsearch from 6.8.0 to 6.8.1
...
Bumps [elasticsearch](https://github.com/elasticsearch/elasticsearch-ruby ) from 6.8.0 to 6.8.1.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/v6.8.1/CHANGELOG.md )
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v6.8.0...v6.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-23 07:38:11 +00:00
dependabot-preview[bot]
8601b8d269
Bump faraday_middleware from 0.13.1 to 0.14.0
...
Bumps [faraday_middleware](https://github.com/lostisland/faraday_middleware ) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/lostisland/faraday_middleware/releases )
- [Commits](https://github.com/lostisland/faraday_middleware/compare/v0.13.1...v0.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 22:26:08 +13:00
dependabot-preview[bot]
777262097a
Bump cancancan from 3.0.1 to 3.0.2
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.0.1...3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 22:26:08 +13:00
codefactor-io
4ff95fbac9
[CodeFactor] Apply fixes
2020-01-21 22:26:08 +13:00
dependabot-preview[bot]
46b612c15f
Bump byebug from 11.0.1 to 11.1.0
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.0.1 to 11.1.0.
- [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.1...v11.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 22:26:08 +13:00
dependabot-preview[bot]
a6c4ae32da
Merge pull request #2390 from Growstuff/dependabot/bundler/faraday_middleware-0.14.0
2020-01-21 04:10:15 +00:00
dependabot-preview[bot]
bad93ed40d
Bump faraday_middleware from 0.13.1 to 0.14.0
...
Bumps [faraday_middleware](https://github.com/lostisland/faraday_middleware ) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/lostisland/faraday_middleware/releases )
- [Commits](https://github.com/lostisland/faraday_middleware/compare/v0.13.1...v0.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 03:49:30 +00:00
dependabot-preview[bot]
61a96420ea
Merge pull request #2391 from Growstuff/dependabot/bundler/cancancan-3.0.2
2020-01-21 03:47:33 +00:00
dependabot-preview[bot]
3316e68eb6
Bump cancancan from 3.0.1 to 3.0.2
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.0.1...3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 03:28:18 +00:00
codefactor-io
34ddf8e98f
[CodeFactor] Apply fixes
2020-01-21 13:12:28 +13:00
dependabot-preview[bot]
c4f30736db
Bump byebug from 11.0.1 to 11.1.0
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.0.1 to 11.1.0.
- [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.1...v11.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 13:08:42 +13:00
Brenda Wallace
8bf990f729
Merge pull request #2389 from Growstuff/dev
...
Production release
2020-01-20 14:30:36 +13:00
Brenda Wallace
a5fa21269f
Remove Elasticsearch 6 config from travis
2020-01-20 13:34:55 +13:00
Brenda Wallace
029a703c2a
Remove Elasticsearch 6 config from travis
2020-01-20 13:34:43 +13:00
Brenda Wallace
f1b5eb1fdd
Turn off Replicas ( #2388 )
...
* Control number of ES replicas
* So, let's have zero replicas on ES
2020-01-20 13:29:19 +13:00
Brenda Wallace
51e69d79b2
Turn on elastic search 7 tests ( #2386 )
...
* Turn on elastic search 7 tests, and Install ES first, check later
this give ES time to start in the background instead of slowing us down
2020-01-19 20:22:07 +13:00
dependabot-preview[bot]
17e0aa8580
Merge pull request #2380 from Growstuff/dependabot/bundler/faker-2.10.1
2020-01-18 06:25:17 +00:00
Brenda Wallace
e64e78646c
Merge pull request #2382 from Growstuff/dev
...
Production release
2020-01-18 19:25:07 +13:00
dependabot-preview[bot]
6cb0f275d0
Bump faker from 2.10.0 to 2.10.1
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-18 05:34:40 +00:00
dependabot-preview[bot]
f508139c36
Merge pull request #2381 from Growstuff/dependabot/bundler/oj-3.10.1
2020-01-18 05:32:55 +00:00
dependabot-preview[bot]
a866032fdf
Bump oj from 3.10.0 to 3.10.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.0 to 3.10.1.
- [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.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-18 05:13:37 +00:00
Brenda Wallace
6279e169de
approved crops only, and only 1 shard ( #2385 )
...
reducing our elastic search usage
2020-01-18 18:11:24 +13:00
Brenda Wallace
08be5a7de6
Fix/travis ci ( #2384 )
...
* Upgrade to xenial on travis-ci
* Wait for ES to start
* Retry elastic search 25 times
2020-01-18 17:41:48 +13:00
Brenda Wallace
5b764b27e1
Merge remote-tracking branch 'upstream/master' into dev
2020-01-17 18:02:56 +13:00
Brenda Wallace
cd344c2605
Fix error when no latitude or longitude
2020-01-17 18:00:45 +13:00
Brenda Wallace
904b06698e
Merge pull request #2379 from Growstuff/dependabot/bundler/i18n-tasks-0.9.30
...
Bump i18n-tasks from 0.9.29 to 0.9.30
2020-01-15 16:09:46 +13:00
dependabot-preview[bot]
d464124522
Bump i18n-tasks from 0.9.29 to 0.9.30
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.29 to 0.9.30.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.29...v0.9.30 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-14 07:43:44 +00:00
Brenda Wallace
dd8311d347
Merge pull request #2377 from Growstuff/dev
...
Production release
2020-01-14 12:47:24 +13:00
Brenda Wallace
9ff43a0659
Merge pull request #2378 from Br3nda/dev
...
Resolve dev conflicts
2020-01-14 12:27:22 +13:00
Brenda Wallace
ae26965144
Merge remote-tracking branch 'upstream/master' into dev
2020-01-14 10:37:13 +13:00
Brenda Wallace
88fd0fb91e
Merge pull request #2320 from Br3nda/cache/harvests
...
Reading #index lookup from ElasticSearch instead of the database
2020-01-13 19:59:25 +13:00
codefactor-io
6c9a15f95e
[CodeFactor] Apply fixes
2020-01-11 21:29:37 +00:00
Brenda Wallace
cdb60d9301
Use planting, not @planting, in plantings/harvests view
2020-01-12 10:23:26 +13:00
Brenda Wallace
c3f75a77ac
Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-12 10:20:29 +13:00
Brenda Wallace
5d8d159cc9
Update app/models/garden.rb
2020-01-12 10:20:21 +13:00
Brenda Wallace
9596d1bac7
style fix ups
2020-01-12 10:18:32 +13:00
Brenda Wallace
32c8698a44
style fix ups
2020-01-12 10:17:07 +13:00
Brenda Wallace
4ca949a703
Added another reindex to specs
2020-01-12 10:14:20 +13:00
Brenda Wallace
6cce74cf4d
tests we find home page records for plantings
2020-01-12 09:52:47 +13:00
Brenda Wallace
eb08584546
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-11 23:11:00 +13:00
Brenda Wallace
709ca5a04f
Fix seeds ES query
2020-01-11 23:10:33 +13:00
Brenda Wallace
cdff37b2eb
style fix ups
2020-01-11 22:57:09 +13:00
Brenda Wallace
27f22e4971
Merge branch 'dev' into cache/harvests
2020-01-11 21:23:46 +13:00
Brenda Wallace
a5a493bbf7
Use rubocop-0-79 on codeclimate
2020-01-11 21:23:31 +13:00
dependabot-preview[bot]
c5b30618c0
Bump rubocop from 0.78.0 to 0.79.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.78.0 to 0.79.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.78.0...v0.79.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-11 21:23:31 +13:00
Martina Simicic
2a61711c96
Name variable to somthing more descriptive
2020-01-10 16:50:52 +13:00
Martina Simicic
4893980ff0
Jump to is only shown when viewing own gardens
2020-01-10 16:50:52 +13:00
Martina Simicic
5e300f9dcf
Unify design for gardens index page
...
Design of the page is now similar to index pages
for plantings and crops
2020-01-10 16:50:52 +13:00
Martina Simicic
298a20e8cc
Add eager loading for garden owner
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
7645bd938d
Bump jsonapi-swagger from 0.7.1 to 0.8.0
...
Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger ) from 0.7.1 to 0.8.0.
- [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases )
- [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.7.1...v0.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
Brenda Wallace
0c7ca50880
small file fixes
2020-01-10 16:50:52 +13:00
Martina Simicic
fb71a46de7
Use positive statements
2020-01-10 16:50:52 +13:00
Martina Simicic
42c8e6434c
Add spec for showing garden type for a garden
2020-01-10 16:50:52 +13:00
Martina Simicic
5895b79860
Show garden type for a garden
2020-01-10 16:50:52 +13:00
Martina Simicic
0f005a3c39
Make garden type optional when editing garden
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
bdce7ec64d
Bump rack-protection from 2.0.7 to 2.0.8.1
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.7 to 2.0.8.1.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.7...v2.0.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
8acd9550f4
Bump bullet from 6.0.2 to 6.1.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
088e9a9a46
Bump faraday from 0.17.1 to 0.17.3
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 0.17.1 to 0.17.3.
- [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.17.1...v0.17.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
103f45dd9d
Bump comfortable_mexican_sofa from 2.0.18 to 2.0.19
...
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa ) from 2.0.18 to 2.0.19.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases )
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.18...v2.0.19 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
Martina Simicic
f8287a918a
Add myself to CONTRIBUTORS.md
2020-01-10 16:50:52 +13:00
Martina Simicic
9dae574de9
Use specific error for raise_error expectation
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
5297cd17cb
Bump faker from 2.9.0 to 2.10.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
4864cd8c56
Bump selenium-webdriver from 3.142.6 to 3.142.7
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.6 to 3.142.7.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
307291975d
Bump webdrivers from 4.1.3 to 4.2.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.3 to 4.2.0.
- [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.3...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
4870dd0214
Bump chartkick from 3.3.0 to 3.3.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.3.0 to 3.3.1.
- [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.3.0...v3.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
codefactor-io
a595a2cd8e
[CodeFactor] Apply fixes to commit 17fa995
2020-01-10 16:50:52 +13:00
Brenda
aab345cf09
Adding more counter caches
2020-01-10 16:50:52 +13:00
Brenda
17f5b1c562
Routes using slugs (instead of ids)
...
this seems to be intended by the models having slugs (added about 7 years ago) but the routes weren't using them
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
f597dd0947
Bump capybara from 3.29.0 to 3.30.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.29.0 to 3.30.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.29.0...3.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
Brenda
7257b2ada1
Update with frozen literals
2020-01-10 16:50:52 +13:00
Brenda
c9808fdad6
Rubocop renamed cops, and fixed cops in todo file
2020-01-10 16:50:52 +13:00
Brenda
f86a47b8a5
Update rubocop target to 5.2
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
2cf15ddfcb
Bump rubocop-rails from 2.4.0 to 2.4.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.0...v2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
c09c9bdee4
Bump sidekiq from 6.0.3 to 6.0.4
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.3 to 6.0.4.
- [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.3...v6.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
Brenda Wallace
d95cacc404
style fix ups
2020-01-10 13:39:57 +13:00
Brenda Wallace
acbc49812d
more indexing in home spec
2020-01-10 13:36:30 +13:00
Brenda Wallace
976b8c2058
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-10 13:32:12 +13:00
Brenda Wallace
7a0458e7e0
reindex plantings before crop planting spec
2020-01-10 13:31:45 +13:00
Brenda Wallace
af7de3bc87
Merge branch 'dev' into cache/harvests
2020-01-10 13:30:00 +13:00
Martina Simicic
3143f0c5ee
Name variable to somthing more descriptive
2020-01-09 20:00:03 +13:00
Martina Simicic
58c7576360
Jump to is only shown when viewing own gardens
2020-01-09 20:00:03 +13:00
Martina Simicic
c546088e56
Unify design for gardens index page
...
Design of the page is now similar to index pages
for plantings and crops
2020-01-09 20:00:03 +13:00
Martina Simicic
e07bb1bdb4
Add eager loading for garden owner
2020-01-09 20:00:03 +13:00
Brenda Wallace
346e67b8f3
yet more reindexing in tests
2020-01-08 15:42:25 +13:00
Brenda Wallace
8dfb8ff954
Update params in seeds controller spec
2020-01-08 08:10:16 +13:00
Brenda Wallace
0acb054004
reindex photos before likes spec
2020-01-08 07:28:53 +13:00
Brenda Wallace
2ad7f5932e
Merge branch 'dev' into cache/harvests
2020-01-07 22:21:37 +13:00
dependabot-preview[bot]
a814598bed
Bump jsonapi-swagger from 0.7.1 to 0.8.0
...
Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger ) from 0.7.1 to 0.8.0.
- [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases )
- [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.7.1...v0.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-07 22:21:18 +13:00
Brenda Wallace
f26aad95a2
small file fixes
2020-01-07 22:20:58 +13:00
Martina Simicic
905087ab8e
Use positive statements
2020-01-07 21:31:48 +13:00
Martina Simicic
ca3b0a8c0b
Add spec for showing garden type for a garden
2020-01-07 21:31:48 +13:00
Martina Simicic
9aaa18c0d3
Show garden type for a garden
2020-01-07 21:31:48 +13:00
Brenda Wallace
8a6c4a774a
reindexs photo in photo controller spec
2020-01-06 21:53:02 +13:00
Brenda Wallace
bccdd6333e
find the crop name from es result
2020-01-06 21:49:53 +13:00
Brenda Wallace
96f0866f39
rubocop fix up
2020-01-06 21:49:00 +13:00
Brenda Wallace
feab98e962
removing dead code
2020-01-05 21:41:16 +13:00
Brenda Wallace
c6988e2189
Re-instate the plantings quick actions
2020-01-05 21:31:51 +13:00
Brenda Wallace
e6e020dbc9
oops
2020-01-05 20:55:51 +13:00
Brenda Wallace
b7e53daeba
fixes to crop photos
2020-01-05 16:57:14 +13:00
Brenda Wallace
ebb8460e44
Merge branch 'dev' into cache/harvests
2020-01-05 16:56:47 +13:00
Daniel O'Connor
88f7f09a18
Merge pull request #2360 from Growstuff/dependabot/bundler/rack-protection-2.0.8.1
...
Bump rack-protection from 2.0.7 to 2.0.8.1
2020-01-05 03:12:09 +10:30
Daniel O'Connor
fbb3eff090
Merge pull request #2364 from simicic/GH-2361_optional_garden_type
...
GH-2361 Optional garden type when editing garden
2020-01-05 03:11:18 +10:30
codefactor-io
7e30b6b6e0
[CodeFactor] Apply fixes
2020-01-03 11:28:51 +00:00
Martina Simicic
ba04c44742
Make garden type optional when editing garden
2020-01-03 09:50:33 +01:00
Brenda Wallace
2e8625d6ff
Reindex harvests before harvest feature spec
2020-01-02 21:10:35 +13:00
Brenda Wallace
6acfa2827b
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-02 21:06:33 +13:00
Brenda Wallace
d757ec4fae
Reindex crops, in crop browse feature spec
2020-01-02 21:06:27 +13:00
dependabot-preview[bot]
752b90ca55
Bump rack-protection from 2.0.7 to 2.0.8.1
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.7 to 2.0.8.1.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.7...v2.0.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-02 07:35:27 +00:00
Brenda Wallace
55411ec535
Merge branch 'dev' into cache/harvests
2020-01-02 20:33:36 +13:00
dependabot-preview[bot]
8360e4ac0f
Bump bullet from 6.0.2 to 6.1.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-02 20:33:10 +13:00
Brenda Wallace
f27ac12563
don't pass photos to crops/_photos
2020-01-02 20:29:41 +13:00
Brenda Wallace
fb0d57c98f
Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-02 20:23:37 +13:00
Brenda Wallace
ff883db279
Revert "displays photos without hitting the database"
...
This reverts commit 139574c9c0 .
2020-01-02 20:23:13 +13:00
dependabot-preview[bot]
e7cf50b2ca
Merge pull request #2358 from Growstuff/dependabot/bundler/faraday-0.17.3
2020-01-02 03:17:38 +00:00
dependabot-preview[bot]
7c0d184d65
Bump faraday from 0.17.1 to 0.17.3
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 0.17.1 to 0.17.3.
- [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.17.1...v0.17.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-02 02:56:42 +00:00
dependabot-preview[bot]
f666b6d100
Merge pull request #2357 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-2.0.19
2020-01-02 02:54:42 +00:00
dependabot-preview[bot]
b44b0a7a5f
Bump comfortable_mexican_sofa from 2.0.18 to 2.0.19
...
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa ) from 2.0.18 to 2.0.19.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases )
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.18...v2.0.19 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-02 02:43:35 +00:00
Brenda Wallace
b556c4b8f4
Merge branch 'dev' into cache/harvests
2020-01-02 15:42:17 +13:00
Martina Simicic
1964b7ce2e
Add myself to CONTRIBUTORS.md
2020-01-02 14:18:51 +13:00
Martina Simicic
9eb5fe7947
Use specific error for raise_error expectation
2020-01-02 14:18:51 +13:00
Brenda Wallace
e1b9381a03
Merge branch 'dev' into cache/harvests
2020-01-01 20:18:33 +13:00
Brenda Wallace
6017c04b5f
don't check if post is liked by member, unless the member is signed in
2020-01-01 15:54:52 +13:00
Brenda Wallace
139574c9c0
displays photos without hitting the database
2020-01-01 14:15:04 +13:00
Brenda Wallace
8a1b8be0ef
Load crops from search, without hitting the database
2020-01-01 13:47:25 +13:00
Brenda Wallace
d46883f39b
don't query for photos that we never read
2020-01-01 12:32:23 +13:00
Brenda Wallace
41c90acbbc
added missing liked flag to photos/card
2020-01-01 11:43:59 +13:00
Brenda Wallace
76e649a0a8
update likes controller spec for new params
2020-01-01 09:26:54 +13:00
Brenda Wallace
d541a4ea0a
another frozen literal
2020-01-01 09:24:59 +13:00
Brenda Wallace
6e81f2966d
fixed colouring of likes button
2020-01-01 09:24:47 +13:00
Brenda Wallace
c4d02edbd1
force reindex after a like
2020-01-01 09:24:24 +13:00
Brenda Wallace
b2738afdc2
fake reindexer on posts, so it doesn't throw errors
2020-01-01 08:42:18 +13:00
Brenda Wallace
e24ef32fe6
like spec, don't make so many photso
2020-01-01 08:41:34 +13:00
Brenda Wallace
36875b620c
harvest search, fixed error when some data not set on model
2020-01-01 08:41:00 +13:00
Brenda Wallace
80038c7f42
set which parts of crop are searchable
2020-01-01 08:40:43 +13:00
Brenda Wallace
63ea6752fa
likes reading from hash from elastic
2020-01-01 08:40:04 +13:00
Brenda Wallace
de3c4d0f62
likes found in controller by id and type of likeable
2020-01-01 08:39:27 +13:00
Brenda Wallace
e9ff6a4388
likes in the elastic search index during spec run
2020-01-01 08:39:08 +13:00
Brenda Wallace
54778d9884
Likes popuplating from elastic, no more extra look ups
2020-01-01 08:38:27 +13:00
Brenda Wallace
f76266a716
photos controller working with ES
2019-12-31 21:46:42 +13:00
Brenda Wallace
6bc0aa7194
Adding missing frozen literals
2019-12-31 21:03:34 +13:00
Brenda Wallace
676345815c
tests for photos searching
2019-12-31 21:02:38 +13:00
Brenda Wallace
95654017d1
added frozen literals
2019-12-31 14:50:31 +13:00
Brenda Wallace
a3215d2555
Rubocop fixes
2019-12-31 14:47:15 +13:00
dependabot-preview[bot]
f348d7e6c5
Bump faker from 2.9.0 to 2.10.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-30 23:36:34 +00:00
dependabot-preview[bot]
1c0cb8e1e8
Bump selenium-webdriver from 3.142.6 to 3.142.7
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.6 to 3.142.7.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-30 22:08:10 +00:00
dependabot-preview[bot]
e1a48dc793
Bump webdrivers from 4.1.3 to 4.2.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.3 to 4.2.0.
- [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.3...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-30 21:54:33 +00:00
Brenda Wallace
38c7bdd7c2
likes count and sorted es search data config
2019-12-30 09:51:10 +13:00
Brenda Wallace
4940b79043
more tidy, crops controller
2019-12-28 10:08:50 +13:00
Brenda Wallace
a89534da53
harvest tidy up
2019-12-28 10:06:10 +13:00
Brenda Wallace
97cacdae0e
2019-12-28 09:50:08 +13:00
Brenda Wallace
c2b4c67077
crop compantion tests
2019-12-28 09:34:04 +13:00
Brenda Wallace
233c5666ad
treat harvests as object(not hash) in harvsets rss feed
2019-12-28 09:33:53 +13:00
Brenda Wallace
b9e9ce1439
index seed.active into ES
2019-12-28 09:33:36 +13:00
Brenda Wallace
8ee332edd8
update harvests controller
2019-12-28 09:20:18 +13:00
Brenda Wallace
ce909332b7
plantings controller update
2019-12-28 09:15:52 +13:00
Brenda Wallace
979d172bd7
rubocop tidy on harvests rss feed
2019-12-28 09:06:23 +13:00
Brenda Wallace
0624184270
tidying up matching attributes for seeds rss feed
2019-12-28 09:06:13 +13:00
Brenda Wallace
59130d5603
display rss feed from harvests objects (instead of hashes)
2019-12-28 08:41:47 +13:00
codefactor-io
5eea6d65d0
[CodeFactor] Apply fixes
2019-12-27 19:34:42 +00:00
Brenda Wallace
6f6edeb14a
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-28 08:34:11 +13:00
Brenda Wallace
9e6d659093
Merge branch 'dev' into cache/harvests
2019-12-28 00:29:34 +13:00
dependabot-preview[bot]
df4ae3a7f3
Bump chartkick from 3.3.0 to 3.3.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.3.0 to 3.3.1.
- [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.3.0...v3.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-27 08:36:24 +00:00
Brenda Wallace
2185892cf5
Trying a different way to ES reindex in spec helper
2019-12-27 19:52:43 +13:00
codefactor-io
1bb8770a6e
[CodeFactor] Apply fixes
2019-12-27 06:51:32 +00:00
Brenda Wallace
75ed36d16c
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-27 19:50:52 +13:00
Brenda Wallace
a015110b05
Reindex before running plantings controller specs
2019-12-27 19:50:46 +13:00
codefactor-io
2685cc70a7
[CodeFactor] Apply fixes to commit 1c7816c
2019-12-27 04:21:06 +00:00
Brenda Wallace
1c7816c951
fixing photos by crop query in photos controller
2019-12-27 17:20:28 +13:00
codefactor-io
9e55d07705
[CodeFactor] Apply fixes to commit 17fa995
2019-12-26 23:42:11 +00:00
Brenda
460ff43a4e
Adding more counter caches
2019-12-26 23:42:11 +00:00
Brenda
42e225469a
Routes using slugs (instead of ids)
...
this seems to be intended by the models having slugs (added about 7 years ago) but the routes weren't using them
2019-12-26 23:30:23 +00:00
Brenda Wallace
0d08f48b71
turn on ES indexing in some controllers
2019-12-27 09:15:53 +13:00
Brenda Wallace
23886de24b
revert plantings#index spec
2019-12-27 09:07:47 +13:00
Brenda Wallace
ebdaaf0738
Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-27 09:04:56 +13:00
Brenda Wallace
c6d6c3cb5c
fixed link in seed card
2019-12-27 09:04:51 +13:00
Brenda Wallace
2d7951d85f
Update buttons_helper.rb
2019-12-27 00:15:05 +13:00
Brenda Wallace
6c7bd77764
Update photo_capable.rb
2019-12-27 00:14:05 +13:00
Brenda Wallace
f4b87672b1
Update _actions.html.haml
2019-12-27 00:11:46 +13:00
Brenda Wallace
fc152feebb
Update _quick_actions.haml
2019-12-26 23:53:26 +13:00
Brenda Wallace
9e0f35b22b
fixing plantings rss feed
2019-12-26 23:22:12 +13:00
Brenda Wallace
e3a789c15e
indexed items matching database attributes
2019-12-26 23:15:38 +13:00
Brenda Wallace
5783bb683a
Merge branch 'dev' into cache/harvests
2019-12-26 18:15:38 +13:00
Brenda Wallace
4d17109cd6
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-26 18:14:45 +13:00
Brenda Wallace
bef7f5b26d
Merge branch 'counter-caches' into cache/harvests
...
Conflicts:
db/schema.rb
2019-12-26 18:14:33 +13:00
Brenda Wallace
18daad541f
Merge branch 'use-slugs' into cache/harvests
2019-12-26 18:13:23 +13:00
codefactor-io
2c2d787521
[CodeFactor] Apply fixes
2019-12-26 05:13:22 +00:00
Brenda
9a704bacfc
no counter cache on many to many association harvest->photos
2019-12-26 18:12:37 +13:00
Brenda
a7e915621e
Index into elastic during db migration
2019-12-26 18:12:15 +13:00
dependabot-preview[bot]
28bda90329
Bump capybara from 3.29.0 to 3.30.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.29.0 to 3.30.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.29.0...3.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-26 05:09:31 +00:00
Brenda Wallace
fca21f85c0
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-26 18:06:27 +13:00
Brenda Wallace
6739545bff
Merge remote-tracking branch 'upstream/dev' into cache/harvests
2019-12-26 18:05:58 +13:00
Brenda
17fa995a17
Adding more counter caches
2019-12-26 16:05:30 +13:00
Brenda
d418f142e7
Routes using slugs (instead of ids)
...
this seems to be intended by the models having slugs (added about 7 years ago) but the routes weren't using them
2019-12-26 15:02:30 +13:00
Brenda Wallace
75f8a4a88a
Merge branch 'dev' into cache/harvests
2019-12-26 13:54:03 +13:00
Brenda Wallace
8bacfa74ad
Merge pull request #2349 from Br3nda/rails-target
...
Update rubocop to represent to rails 5.2
2019-12-26 13:53:33 +13:00
Brenda
bdee705b55
Update with frozen literals
2019-12-26 13:38:17 +13:00
Brenda
703962c0f7
Rubocop renamed cops, and fixed cops in todo file
2019-12-26 13:22:36 +13:00
Brenda
78004732d0
Update rubocop target to 5.2
2019-12-26 13:22:36 +13:00
Brenda Wallace
daf415e6cb
Merge branch 'dev' into cache/harvests
2019-12-26 12:55:11 +13:00
Brenda Wallace
eab10eaf7c
many to many counter caches weren't working
...
and causing errors.
2019-12-26 12:54:36 +13:00
codefactor-io
877baf22db
[CodeFactor] Apply fixes to commit 2313812
2019-12-25 22:00:43 +00:00
Brenda Wallace
2313812272
Removed set_garden
2019-12-26 11:00:21 +13:00
dependabot-preview[bot]
8b97d36267
Bump rubocop-rails from 2.4.0 to 2.4.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.0...v2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-25 21:56:19 +00:00
Brenda Wallace
e84ab6d2a2
seeds using object instead of hash
2019-12-25 16:37:19 +13:00
Brenda Wallace
aea0d5877d
use object instead of hash for displaying crops
2019-12-25 16:28:27 +13:00
Brenda Wallace
ace0977c75
plantings view using object instead of hash
2019-12-25 16:18:34 +13:00
Brenda Wallace
3835a4f936
photos from ES
2019-12-25 15:52:06 +13:00
Brenda Wallace
453d0cc795
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-25 14:52:21 +13:00
Brenda Wallace
f42328f85e
harvests#index using model-like varaibles
2019-12-25 14:52:15 +13:00
codefactor-io
950dd7f810
[CodeFactor] Apply fixes
2019-12-25 01:27:49 +00:00
Brenda Wallace
9f46009fd1
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-25 14:27:19 +13:00
Brenda Wallace
673f977efc
Photos controller using elastic search
2019-12-25 14:27:13 +13:00
Brenda Wallace
39d208dec1
Rename the search concens
2019-12-25 14:26:50 +13:00
codefactor-io
99d436a91f
[CodeFactor] Apply fixes to commit 5962081
2019-12-24 22:45:59 +00:00
Brenda Wallace
5962081c9e
fix specs fpr seeds rss feed
2019-12-25 11:42:29 +13:00
Brenda Wallace
2c5d5e0983
fix ruby syntax in spec
2019-12-24 22:18:14 +13:00
Brenda Wallace
b8c94c13cc
refactor to use search:true instead of reindex
2019-12-24 22:15:01 +13:00
Brenda Wallace
f3ffd6c086
remove extra index runs, use search:true from spec helper
2019-12-24 22:11:14 +13:00
Brenda Wallace
ee4aa4dec3
refresh in dex at start of spec run
2019-12-24 22:10:49 +13:00
Brenda Wallace
c708d4d22b
Mark spec as needing elastic search
2019-12-24 22:01:55 +13:00
Brenda Wallace
b25a13df89
fix rss feeds
2019-12-24 21:53:00 +13:00
Brenda Wallace
56c3fdd4fe
index records before vie spec
2019-12-24 20:23:27 +13:00
Brenda Wallace
e6d9a3c1cf
reindex into ES on homepage
2019-12-24 13:36:15 +13:00
Brenda Wallace
68b22d71d0
fixed indexing of seeds when they have no plant_before
2019-12-24 12:25:16 +13:00
Brenda Wallace
fafe611315
reinstate planting harvest and planting seeds
2019-12-24 11:54:29 +13:00
codefactor-io
df97d51940
[CodeFactor] Apply fixes
2019-12-23 22:39:08 +00:00
Brenda Wallace
4a2bb2342c
Sorting out cancancan, copied to common parent controller
2019-12-24 11:38:30 +13:00
Brenda Wallace
de84214719
fixed trailing whitesapce
2019-12-24 10:45:18 +13:00
Brenda Wallace
6f950e685b
hand loading back to cancancan
2019-12-24 10:45:02 +13:00
Brenda Wallace
241de360f3
Merge branch 'dev' into cache/harvests
2019-12-24 09:46:22 +13:00
dependabot-preview[bot]
2d6f1a6284
Bump sidekiq from 6.0.3 to 6.0.4
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.3 to 6.0.4.
- [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.3...v6.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-23 20:45:58 +00:00
Brenda Wallace
44a59a30e1
seeds#index rss format specs updated to use ES
2019-12-24 09:44:12 +13:00
Brenda Wallace
99a2dfd464
index all models in the spec helper
2019-12-24 09:25:58 +13:00
Brenda Wallace
6622aaf886
used expect syntax
2019-12-24 09:25:15 +13:00
Brenda Wallace
d71d8aa603
seeds view spec refresehs the ES index
2019-12-24 09:24:43 +13:00
Brenda Wallace
1f17ea1e03
fixes (most of) seed rss specs
2019-12-23 16:52:56 +13:00
Brenda Wallace
f8abcd4d1c
gardens controller spec using slug
2019-12-23 15:08:10 +13:00
Brenda Wallace
8f25ef5258
index seeds in spec
2019-12-23 15:07:24 +13:00
codefactor-io
8fe5e4435b
[CodeFactor] Apply fixes
2019-12-22 20:46:53 +00:00
Brenda Wallace
7f52d31b85
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-23 09:46:16 +13:00
Brenda Wallace
bbaa0436cb
ES query doesn't need to be public on the controller
2019-12-23 09:46:11 +13:00
codefactor-io
75c7d63956
[CodeFactor] Apply fixes to commit b730378
2019-12-22 20:46:08 +00:00
Brenda Wallace
b730378e14
tidy up and fix specs for harvest controller
2019-12-23 09:45:35 +13:00
Brenda Wallace
4cf5daf3b8
gardens charts controller using slug
2019-12-23 09:44:06 +13:00
Brenda Wallace
96f6fd3708
update to expect syntax
2019-12-22 17:16:13 +13:00
Brenda Wallace
85dd46a1b5
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-22 17:00:36 +13:00
Brenda Wallace
929374f77a
rubocop renamed : Metrics/LineLength to : Layout/LineLength
2019-12-22 17:00:30 +13:00
codefactor-io
81051c6865
[CodeFactor] Apply fixes to commit 5a6ee38
2019-12-22 03:58:03 +00:00
Brenda Wallace
5a6ee38722
update plantings controller spec to look for a hash of searchkick results
2019-12-22 16:57:28 +13:00
Brenda Wallace
29b98a5bcc
adding photos (and liking photos) cause touch do the cache in invalidated
2019-12-22 16:41:26 +13:00
Brenda Wallace
12e91a7441
Specify rails 5.2 in rubocop config
2019-12-22 16:04:33 +13:00
Brenda Wallace
c54c417b61
no frozen comment on this spec
2019-12-22 16:04:21 +13:00
codefactor-io
78fed0e8de
[CodeFactor] Apply fixes
2019-12-22 02:47:35 +00:00
Brenda Wallace
4b9863a3e6
index harvests into ES during harvests#index spec
2019-12-22 15:46:29 +13:00
Brenda Wallace
c79e83c26a
fixed last garden routing spec
2019-12-22 15:43:57 +13:00
Brenda Wallace
2c8a035683
Update garden routing spec
2019-12-21 19:36:59 +13:00
Brenda Wallace
80b5b93d76
Merge branch 'dev' into cache/harvests
2019-12-21 18:52:34 +13:00
Brenda Wallace
74bbfb9313
Merge remote-tracking branch 'upstream/dev'
2019-12-21 18:52:06 +13:00
Brenda Wallace
f1270ecdb8
fix deploy
2019-12-21 18:51:30 +13:00
codefactor-io
d7fc61e0ec
[CodeFactor] Apply fixes to commit 86a8f95
2019-12-21 04:56:25 +00:00
Brenda Wallace
86a8f95e60
get photo from crop (saved into ES)
2019-12-21 17:55:34 +13:00
Brenda Wallace
ce18dc0610
Display seeds from elastic search
2019-12-21 17:55:14 +13:00
Brenda Wallace
bed64af567
Merge pull request #2345 from Growstuff/dev
...
production release
2019-12-21 17:34:39 +13:00
Brenda Wallace
786963eb8f
Update seeds rss to expect a hash
2019-12-21 17:33:59 +13:00
Brenda Wallace
6b1f85fe72
Merge branch 'dev' into cache/harvests
2019-12-21 17:27:23 +13:00
Brenda Wallace
97c4bd3919
Remove newrelic ( #2339 )
...
* Remove newrelic
* Update forum view spec
* only test for the first 20 chars of post subject
2019-12-21 17:07:20 +13:00
Brenda Wallace
8bec2a277d
Merge branch 'dev' into cache/harvests
2019-12-21 16:59:47 +13:00
Brenda Wallace
9c2beb304f
show days of progress ( #2344 )
...
* show days of progress
* Update planting model spec to use age_in_days
2019-12-21 16:49:43 +13:00
dependabot-preview[bot]
343e633bf6
Bump scout_apm from 2.6.5 to 2.6.6
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.5 to 2.6.6.
- [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.5...v2.6.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-21 03:43:30 +00:00
codefactor-io
cb75e4ff0c
[CodeFactor] Apply fixes to commit 44d635e
2019-12-21 03:25:07 +00:00
dependabot-preview[bot]
deb5d820b5
Bump unicorn from 5.5.1 to 5.5.2 ( #2342 )
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.5.1 to 5.5.2.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-21 16:24:52 +13:00
Brenda Wallace
44d635e9b3
Update plantings#index view spec to use hashes like an ES search result
2019-12-21 16:24:21 +13:00
Brenda Wallace
bbaf508da9
harvest routing spec now using slugs
2019-12-21 09:42:21 +13:00
Brenda Wallace
306732d27c
seed routing spec now using slugs
2019-12-21 09:41:21 +13:00
Brenda Wallace
2792382792
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-21 09:40:23 +13:00
Brenda Wallace
3decc69bca
planting routing specs to use slug
2019-12-21 09:40:11 +13:00
codefactor-io
1882c75941
[CodeFactor] Apply fixes
2019-12-20 20:37:33 +00:00
Brenda Wallace
cae9fffea6
Index crop as well on photo changes
2019-12-21 09:36:52 +13:00
Brenda Wallace
b4afefcb85
Reindex after a photo association save or delete
2019-12-21 09:32:19 +13:00
Brenda Wallace
c711d7f763
photos don't have a slug
2019-12-21 09:31:52 +13:00
Brenda Wallace
77b82f66d7
Update .codeclimate.yml
2019-12-21 09:13:17 +13:00
dependabot-preview[bot]
90689c6808
Bump rubocop from 0.77.0 to 0.78.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.77.0 to 0.78.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.77.0...v0.78.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-20 20:12:53 +00:00
dependabot-preview[bot]
fb17be6278
Bump searchkick from 4.1.1 to 4.2.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.1.1 to 4.2.0.
- [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.1.1...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-20 06:55:40 +00:00
Brenda Wallace
07819fa1c2
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-20 17:34:53 +13:00
Brenda Wallace
bb0a5e0dd0
Restore app.json
2019-12-20 17:34:40 +13:00
codefactor-io
9a0f22a4b9
[CodeFactor] Apply fixes to commit fc1c507
2019-12-20 04:33:33 +00:00
Brenda Wallace
fc1c507a96
Load planting rss from elastic too
2019-12-20 17:32:48 +13:00
codefactor-io
f8916dfecb
[CodeFactor] Apply fixes
2019-12-20 04:16:33 +00:00
Brenda Wallace
9234ca0a6d
Index plantings, seeds, and harvests before home page tests
2019-12-20 17:15:41 +13:00
Brenda Wallace
d15802c0e7
Merge remote-tracking branch 'origin/cache/harvests' into cache/harvests
2019-12-20 17:14:30 +13:00
Brenda Wallace
9d68ab0228
Rubocop fix of controller
2019-12-20 17:13:54 +13:00
codefactor-io
e8760f9c38
[CodeFactor] Apply fixes
2019-12-20 03:33:23 +00:00
Brenda Wallace
42f1e61496
controller tidy up
2019-12-20 16:30:58 +13:00
Brenda Wallace
9f021e76a6
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-20 16:30:09 +13:00
Brenda Wallace
be7846d9a2
Moved rubocop yaml around, hoping to fix codefactor
2019-12-20 16:29:56 +13:00
codefactor-io
d95bc774a2
[CodeFactor] Apply fixes
2019-12-20 03:22:04 +00:00
Brenda Wallace
85f99d3916
Display seeds from elastic search
2019-12-20 16:21:32 +13:00
Brenda Wallace
ef8ec3c603
Reindex plantings in spec
2019-12-20 16:21:23 +13:00
Brenda Wallace
e31f6a7c36
Index into ES after migration
2019-12-20 16:21:11 +13:00
Brenda Wallace
8789fee365
Seeds into elastic search
2019-12-20 16:20:52 +13:00
Brenda Wallace
d59f8f4419
add ES field mappings
2019-12-20 16:20:31 +13:00
Brenda Wallace
b0b732a5b9
Reindex in tests
2019-12-20 09:50:21 +13:00
codefactor-io
bdbcca19f0
[CodeFactor] Apply fixes to commit 4c91da8
2019-12-19 20:45:06 +00:00
Brenda Wallace
4c91da855c
Add ES mappings for plantings
2019-12-20 09:44:40 +13:00
codefactor-io
0c338e771c
[CodeFactor] Apply fixes to commit 18cb218
2019-12-19 20:33:55 +00:00
Brenda Wallace
18cb218807
Add mappings on crop search
2019-12-20 09:33:23 +13:00
Brenda Wallace
c0103a3f42
find seeds by slug
2019-12-20 09:21:47 +13:00
Brenda Wallace
8c1761d40e
index crops before testing crops#index
2019-12-20 09:18:16 +13:00
Brenda Wallace
97e9773c7e
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-19 21:57:00 +13:00
Brenda Wallace
95c1ee7a81
Fixed loading gardens
2019-12-19 21:56:16 +13:00
codefactor-io
424132d32e
[CodeFactor] Apply fixes to commit c9fddc4
2019-12-19 08:55:10 +00:00
Brenda Wallace
c9fddc4b7a
Use slugs as params
2019-12-19 21:54:47 +13:00
Brenda Wallace
32178e2c3e
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-19 21:49:37 +13:00
Brenda Wallace
5e5cdf6246
Fixing up lookup by slug
2019-12-19 21:49:18 +13:00
codefactor-io
700d2b4f30
[CodeFactor] Apply fixes to commit 3deafc0
2019-12-19 08:27:22 +00:00
Brenda Wallace
3deafc039d
Loading a harvest
2019-12-19 21:26:53 +13:00
Brenda Wallace
ee05093ce5
Merge remote-tracking branch 'origin/cache/harvests' into cache/harvests
2019-12-19 16:55:15 +13:00
Brenda Wallace
78e111af80
fixing paths to member harvests (with more tests too)
2019-12-19 16:54:05 +13:00
Brenda Wallace
2f3b6b3d22
member routing specs
2019-12-19 15:33:46 +13:00
codefactor-io
2558cb14f8
[CodeFactor] Apply fixes
2019-12-19 02:00:25 +00:00
Brenda Wallace
38e36c4a2c
Merge remote-tracking branch 'upstream/dev' into cache/harvests
...
Conflicts:
.rubocop_todo.yml
app/controllers/likes_controller.rb
app/models/concerns/crop_search.rb
app/services/crop_search_service.rb
2019-12-19 10:28:17 +13:00
dependabot[bot]
a32df8b6c3
Bump rack from 2.0.7 to 2.0.8 ( #2338 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.0.7 to 2.0.8.
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8 )
Signed-off-by: dependabot[bot] <support@github.com >
2019-12-19 08:51:01 +13:00
dependabot-preview[bot]
7575f5df68
Bump faker from 2.8.1 to 2.9.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.8.1 to 2.9.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.8.1...v2.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-17 07:49:31 +00:00
dependabot-preview[bot]
8b8b885846
Bump rubocop-rspec from 1.37.0 to 1.37.1
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.37.0 to 1.37.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.37.0...v1.37.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-17 07:36:56 +00:00
dependabot[bot]
f549cd7785
Bump excon from 0.64.0 to 0.71.0 ( #2335 )
...
Bumps [excon](https://github.com/excon/excon ) from 0.64.0 to 0.71.0.
- [Release notes](https://github.com/excon/excon/releases )
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt )
- [Commits](https://github.com/excon/excon/compare/v0.64.0...v0.71.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2019-12-17 10:08:41 +13:00
Brenda Wallace
04fd1a343a
Rubocop update ( #2334 )
...
* Update rubocop config
* Rubocop update - for rubocop 0.77
* [CodeFactor] Apply fixes
* rubocop fixes
* [CodeFactor] Apply fixes to commit 2826c2e
2019-12-16 22:35:33 +13:00
dependabot-preview[bot]
127011f533
Bump font-awesome-sass from 5.11.2 to 5.12.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.11.2 to 5.12.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.11.2...5.12.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-16 09:35:06 +00:00
Daniel O'Connor
b55f3ca385
Merge pull request #2323 from Growstuff/dependabot/bundler/haml_lint-0.34.1
...
Bump haml_lint from 0.34.0 to 0.34.1
2019-12-16 15:41:48 +10:00
Daniel O'Connor
ab3bba0358
Merge pull request #2325 from Growstuff/dependabot/bundler/scout_apm-2.6.5
...
Bump scout_apm from 2.6.4 to 2.6.5
2019-12-16 15:40:21 +10:00
dependabot-preview[bot]
b0701b837e
Bump faker from 2.8.0 to 2.8.1
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.8.0...v2.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-16 04:40:49 +00:00
Daniel O'Connor
940f2eeb8a
Merge branch 'dev' into dependabot/bundler/scout_apm-2.6.5
2019-12-16 14:33:50 +10:00
Daniel O'Connor
c04590c28c
Merge branch 'dev' into dependabot/bundler/haml_lint-0.34.1
2019-12-16 14:33:32 +10:00
Brenda Wallace
32904fede3
Merge pull request #2330 from Br3nda/search-errors
...
Fix intermittent search errors
2019-12-15 16:28:39 +13:00
codefactor-io
22d7bd6a4e
[CodeFactor] Apply fixes
2019-12-15 02:58:12 +00:00
Brenda
2ec23d6a08
Remove unnecesary mapping
2019-12-15 15:56:41 +13:00
Brenda
a91a2c6ea5
Add ElasticSearch mappings, to fix intermittent errors
2019-12-15 15:56:22 +13:00
Brenda Wallace
8ebf5670a1
Merge pull request #2328 from Growstuff/dev
...
Release caching
2019-12-14 15:08:53 +13:00
Brenda Wallace
fc69507f37
Merge pull request #2327 from Br3nda/caching
...
Cache some heavy queries on models
2019-12-14 14:18:24 +13:00
Brenda Wallace
91b399196a
Cache some heavy queries on models
2019-12-14 14:03:01 +13:00
Brenda Wallace
0b9b94f1d5
Plantings#index using Elastic Search
2019-12-14 13:52:02 +13:00
Brenda Wallace
42e69fc199
Don't need to say we need ES.
2019-12-14 13:51:49 +13:00
dependabot-preview[bot]
8c08e4f143
Bump scout_apm from 2.6.4 to 2.6.5
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.4 to 2.6.5.
- [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.4...v2.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-13 07:21:05 +00:00
dependabot-preview[bot]
fcdd74b66c
Bump haml_lint from 0.34.0 to 0.34.1
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.34.0 to 0.34.1.
- [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.34.0...v0.34.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 07:25:01 +00:00
Brenda Wallace
b343f89997
Photos indexed in elastic search
2019-12-11 11:42:34 +13:00
Brenda Wallace
c772a2984d
More scaling impromvements
2019-12-11 11:40:04 +13:00
Brenda Wallace
87f0e44080
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-11 11:39:24 +13:00
Brenda Wallace
b44877a63e
Using elastic for plantings look ups
2019-12-11 11:38:34 +13:00
Brenda Wallace
b0d55ad064
Counter cache for posts
2019-12-10 20:30:57 +13:00
codefactor-io
c7e8efb1f1
[CodeFactor] Apply fixes to commit 5afe3e1
2019-12-10 00:37:06 +00:00
Brenda Wallace
5afe3e1c1e
Pulling plantings from elastic search too
2019-12-10 13:36:23 +13:00
Brenda Wallace
43b7dc7d7c
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-10 09:28:37 +13:00
Brenda Wallace
be1ee2098d
Use the counter for harvests
2019-12-10 09:28:20 +13:00
Brenda Wallace
e4b1a2f221
Add counter caches
2019-12-10 09:27:44 +13:00
codefactor-io
18f016766a
[CodeFactor] Apply fixes to commit 282791d
2019-12-09 09:20:19 +00:00
Brenda Wallace
282791d91b
Pull crops and harvests from elasticsearch
2019-12-09 22:19:20 +13:00
Brenda Wallace
bfe1b072db
Memcache caching of harvests
2019-12-09 21:08:09 +13:00
Brenda Wallace
1c1fa043e3
Merge pull request #2319 from Growstuff/dev
...
Production release
2019-12-09 12:59:46 +13:00
Brenda Wallace
49941d3c1b
Merge branch 'master' into dev
2019-12-09 12:59:25 +13:00
Brenda Wallace
7c38f7eca6
Pull homepage data directly from elasticsearch ( #2316 )
...
* Pull homepage data directly from elasticsearch
* Removing non-elasticsearch options
* [CodeFactor] Apply fixes to commit c46b2e7
2019-12-09 10:03:48 +13:00
Brenda Wallace
6c8ff10d7e
Production release ( #2318 )
...
* Reduce the number of queries to find if member has seed of this crop
* Don't read crop photos from db again
* Cache the footer
* Reduce queries per thumbnail.
* Reducing the number of db queries on crops#show
* Cache photos
* Add query_diet, to count queries on the page
* Fix model spec
* Put query count on the page
* Little bit less queries to look up sci name
* Turn on bullet in dev
* Tell default photo to expire in 1 hour
* Small improvements to crops controller to reduce query count
* Don't cache photo do agressively
* Fix specs
* Bump bootstrap from 4.3.1 to 4.4.1
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.3.1 to 4.4.1.
- [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.3.1...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* [Security] Bump puma from 4.3.0 to 4.3.1
Bumps [puma](https://github.com/puma/puma ) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [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.3.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Move signout link into user menu
* fixed logo display on small screens
* Update specs to find logout link
* [CodeFactor] Apply fixes to commit b999d89
* Bump listen from 3.2.0 to 3.2.1
Bumps [listen](https://github.com/guard/listen ) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.2.0...v3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Update .travis.yml
* Removed site name from homepage (#2313 )
2019-12-08 21:35:43 +13:00
Brenda Wallace
81eefcbfc3
Merge remote-tracking branch 'upstream/master' into dev
2019-12-07 08:22:24 +13:00
Brenda Wallace
242d5a6641
Removed site name from homepage ( #2313 )
2019-12-06 22:22:21 +13:00
Brenda Wallace
8863f3289d
Update .travis.yml
2019-12-06 20:54:53 +13:00
dependabot-preview[bot]
6be1f791c7
Bump listen from 3.2.0 to 3.2.1
...
Bumps [listen](https://github.com/guard/listen ) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.2.0...v3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-06 07:47:15 +00:00
Brenda Wallace
c6fc519e7d
Production release ( #2311 )
...
* Reduce the number of queries to find if member has seed of this crop
* Don't read crop photos from db again
* Cache the footer
* Reduce queries per thumbnail.
* Reducing the number of db queries on crops#show
* Cache photos
* Add query_diet, to count queries on the page
* Fix model spec
* Put query count on the page
* Little bit less queries to look up sci name
* Turn on bullet in dev
* Tell default photo to expire in 1 hour
* Small improvements to crops controller to reduce query count
* Don't cache photo do agressively
* Fix specs
* Bump bootstrap from 4.3.1 to 4.4.1
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.3.1 to 4.4.1.
- [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.3.1...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* [Security] Bump puma from 4.3.0 to 4.3.1
Bumps [puma](https://github.com/puma/puma ) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [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.3.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Move signout link into user menu
* fixed logo display on small screens
* Update specs to find logout link
* [CodeFactor] Apply fixes to commit b999d89
2019-12-06 20:46:24 +13:00
codefactor-io
021b510d35
[CodeFactor] Apply fixes to commit b999d89
2019-12-06 19:55:42 +13:00
Brenda Wallace
0dcf0d2a40
Update specs to find logout link
2019-12-06 19:55:42 +13:00
Brenda Wallace
7d4d257097
fixed logo display on small screens
2019-12-06 19:55:42 +13:00
Brenda
dbb50263aa
Move signout link into user menu
2019-12-06 19:55:42 +13:00
dependabot-preview[bot]
5aaa1b7242
[Security] Bump puma from 4.3.0 to 4.3.1
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [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.3.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-05 23:09:48 +00:00
dependabot-preview[bot]
e9f830cb00
Bump bootstrap from 4.3.1 to 4.4.1
...
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.3.1 to 4.4.1.
- [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.3.1...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-05 08:11:12 +00:00
Brenda Wallace
63d429846b
Fix specs
2019-12-04 21:48:00 +13:00
Brenda
87d11c5bb1
Small improvements to crops controller to reduce query count
2019-12-04 21:48:00 +13:00
Brenda Wallace
3111e8a177
Don't cache photo do agressively
2019-12-04 21:48:00 +13:00
Brenda
8a28c93b3d
Tell default photo to expire in 1 hour
2019-12-04 21:48:00 +13:00
Brenda
e6031fbc14
Turn on bullet in dev
2019-12-04 21:48:00 +13:00
Brenda
cd2c692f34
Little bit less queries to look up sci name
2019-12-04 21:48:00 +13:00
Brenda Wallace
59fffbfa7b
Put query count on the page
2019-12-04 21:48:00 +13:00
Brenda Wallace
44855cb8b2
Add query_diet, to count queries on the page
2019-12-04 21:48:00 +13:00
Brenda Wallace
8a0d551f90
Cache photos
2019-12-04 21:48:00 +13:00
Brenda
c25f448d97
Reducing the number of db queries on crops#show
2019-12-04 21:48:00 +13:00
Brenda
12b1ed9bcd
Reduce queries per thumbnail.
2019-12-04 21:48:00 +13:00
Brenda Wallace
2623b0d01c
Cache the footer
2019-12-04 21:48:00 +13:00
Brenda
40627c5873
Don't read crop photos from db again
2019-12-04 21:48:00 +13:00
Brenda Wallace
092dc59588
Reduce the number of queries to find if member has seed of this crop
2019-12-04 21:48:00 +13:00
Brenda Wallace
4cf98153ba
Fix model spec
2019-12-04 21:48:00 +13:00
Brenda Wallace
8f7f056c81
Merge pull request #2303 from Br3nda/reduce-queries
...
Reduce number of db queries
2019-12-04 21:33:16 +13:00
Brenda Wallace
34fcbffd24
Fix specs
2019-12-04 21:15:50 +13:00
Brenda
607eae2a43
Small improvements to crops controller to reduce query count
2019-12-04 21:02:33 +13:00
Brenda Wallace
f4484cf376
Don't cache photo do agressively
2019-12-04 21:02:33 +13:00
Brenda
c42fb5df51
Tell default photo to expire in 1 hour
2019-12-04 21:02:33 +13:00
Brenda
9159df81c9
Turn on bullet in dev
2019-12-04 21:02:33 +13:00
Brenda
56cb291508
Little bit less queries to look up sci name
2019-12-04 21:02:33 +13:00
Brenda Wallace
3ba807b610
Put query count on the page
2019-12-04 21:02:29 +13:00
Brenda Wallace
cc7aceb990
Add query_diet, to count queries on the page
2019-12-04 20:59:56 +13:00
Brenda Wallace
d22fb68eee
Cache photos
2019-12-04 20:59:56 +13:00
Brenda
4065b1b248
Reducing the number of db queries on crops#show
2019-12-04 20:59:56 +13:00
Brenda
500dd5e57b
Reduce queries per thumbnail.
2019-12-04 20:59:56 +13:00
Brenda Wallace
b3ecfa36cd
Cache the footer
2019-12-04 20:59:56 +13:00
Brenda
b443435627
Don't read crop photos from db again
2019-12-04 20:59:56 +13:00
Brenda Wallace
fdf5a59ffd
Reduce the number of queries to find if member has seed of this crop
2019-12-04 20:59:56 +13:00
Brenda Wallace
8678a6dd8a
Fix model spec
2019-12-04 20:59:56 +13:00
Brenda Wallace
2e30d2cac1
Merge pull request #2306 from Growstuff/dev
...
Hotfix, buttons on small screens
2019-12-03 22:36:09 +13:00
Brenda Wallace
9e87787977
Fix color of crop action links
2019-12-03 21:48:15 +13:00
dependabot-preview[bot]
6c0462eed6
Bump faker from 2.7.0 to 2.8.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.7.0...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-02 08:49:43 +00:00
Brenda Wallace
623ecc4410
Merge pull request #2302 from Growstuff/dev
...
Production release
2019-12-01 12:58:21 +13:00
Brenda Wallace
58d2510613
Fix signin/signout on mobile
2019-12-01 12:46:44 +13:00
Brenda Wallace
245ea3f10a
Removed caching that causes facts to appear twice
2019-12-01 08:21:50 +13:00
Brenda Wallace
723fd8aa79
Remove Calistoga font from headers
2019-12-01 08:08:40 +13:00
Brenda Wallace
dc540bbd74
Merge pull request #2301 from Br3nda/fonts
...
Logo update
2019-12-01 07:20:35 +13:00
Brenda
dde9e69b66
consistent cards on crops#show
2019-11-30 23:17:29 +13:00
Brenda
c963533a15
add padding around logo text
2019-11-30 23:17:04 +13:00
Brenda
b1b98fd856
Trimmed edges of logo
2019-11-30 23:01:13 +13:00
Brenda
89072bdb74
Marked icons to be ignored by screen readers
2019-11-30 21:56:53 +13:00
Brenda Wallace
0a327cba67
Tidier sign-in/sign-up links
2019-11-30 21:53:23 +13:00
Brenda Wallace
9eb08bbf29
Merge css rules
2019-11-30 21:41:55 +13:00
Brenda
b40e7221e2
Enlarge the headers in jumbotrons
2019-11-30 21:14:59 +13:00
Brenda
bdefa9dad9
consistent headers
2019-11-30 20:49:54 +13:00
Brenda
bb4ea1ed0d
Renamed spec so it find the renamed view
2019-11-30 20:09:54 +13:00
Brenda
fed6a7df97
Change a h3 into just a <strong>
2019-11-30 20:09:39 +13:00
Brenda
ee42fd9e87
Added calistoga font
2019-11-30 19:55:16 +13:00
Brenda Wallace
9af275225e
Fixed translations on navbar
2019-11-30 19:54:51 +13:00
Brenda Wallace
285cd6b4f5
Set all headers to Calistoga font
2019-11-30 19:54:19 +13:00
Brenda Wallace
c514a57f47
Apply suggestions from code review
2019-11-30 16:34:12 +13:00
Brenda Wallace
cdc87b5511
Tidy up mobile view of logo/nav
2019-11-30 16:22:45 +13:00
Brenda Wallace
057e6f3069
Change fonts, tidy up navbar, and use text for site name
2019-11-30 16:22:45 +13:00
dependabot-preview[bot]
1570717152
Bump oj from 3.9.2 to 3.10.0
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.2 to 3.10.0.
- [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.2...v3.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-29 19:31:27 +00:00
dependabot-preview[bot]
d06f511536
Bump rubocop-rails from 2.3.2 to 2.4.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.2...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-28 11:06:47 +00:00
dependabot-preview[bot]
fd0e91c8d5
Bump faraday from 0.17.0 to 0.17.1
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 0.17.0 to 0.17.1.
- [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.17.0...v0.17.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-28 10:44:44 +00:00
Brenda Wallace
4b2f9d4d8f
Update rubocop on codeclimate to match gem bundle
2019-11-28 22:28:03 +13:00
dependabot-preview[bot]
9ee416ddd4
Bump rubocop from 0.76.0 to 0.77.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.76.0 to 0.77.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.76.0...v0.77.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-28 09:27:04 +00:00
dependabot-preview[bot]
7a6d54c088
Bump rubocop-rspec from 1.36.0 to 1.37.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.36.0 to 1.37.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.36.0...v1.37.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-26 08:27:23 +00:00
dependabot-preview[bot]
887c2498a2
Bump loofah from 2.3.1 to 2.4.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.3.1 to 2.4.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.3.1...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-26 08:07:37 +00:00
dependabot-preview[bot]
0fb5e06ac4
Bump capybara-screenshot from 1.0.23 to 1.0.24
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.23 to 1.0.24.
- [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.23...v1.0.24 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-25 08:20:47 +00:00
Brenda Wallace
d26af32c32
Merge pull request #2290 from Growstuff/dev
...
Production
2019-11-25 15:40:19 +13:00
Brenda Wallace
e2dcd72472
Merge pull request #2286 from Br3nda/predict-perenial-harvest
...
Predict month of harvest on perennials [EDIT: show nearby harvesting months for all crops]
2019-11-25 14:56:13 +13:00
Brenda Wallace
82e2734caa
USe the codeclimate gem
2019-11-25 14:03:59 +13:00
Brenda Wallace
5ae4dbaa73
Fix coverage reporter
2019-11-25 13:33:47 +13:00
Brenda Wallace
faf375c932
Feature spec for month by month harvest
2019-11-25 13:25:05 +13:00
Brenda Wallace
ace0f0ac16
stub the neighbours variable on planting views spec
2019-11-24 12:46:03 +13:00
Brenda Wallace
cf2c42a7e0
Only display location if we have a location
2019-11-24 12:21:37 +13:00
Brenda Wallace
e7c30ef448
Wrapped long lines
2019-11-24 12:18:04 +13:00
Brenda Wallace
1e663fc3df
Layout tidy to cope with neighbours on page
2019-11-24 12:13:48 +13:00
Brenda Wallace
bcbee5831f
Everyone gets harvest months, not just perennials
2019-11-24 11:42:10 +13:00
Brenda Wallace
2538b71225
Planting model spec for perenial harvests
2019-11-24 11:37:33 +13:00
Brenda Wallace
fd1a608e4c
Elaborated comment
2019-11-24 11:37:18 +13:00
Brenda Wallace
9aae07b8df
Screen reader niceness
2019-11-24 11:37:07 +13:00
Brenda Wallace
6325df25b8
Make the month an int
2019-11-24 11:36:55 +13:00
Brenda Wallace
b8c1f10907
Merge remote-tracking branch 'origin/predict-perenial-harvest' into predict-perenial-harvest
2019-11-24 10:46:07 +13:00
Brenda Wallace
83f0182551
rubocop lint
2019-11-24 10:41:20 +13:00
Brenda Wallace
0f73c13622
Merge branch 'dev' into predict-perenial-harvest
2019-11-24 10:40:22 +13:00
Brenda Wallace
8a81daf7cf
Merge pull request #2288 from Growstuff/dev
...
Production release
2019-11-24 10:39:57 +13:00
Brenda Wallace
5b7de1ae7a
Added location
2019-11-24 10:39:06 +13:00
Brenda Wallace
554adf234e
Allow chaining on Harvest predictions method returns
2019-11-24 10:30:56 +13:00
Brenda Wallace
e3b01cdca0
Merge pull request #2287 from Br3nda/homepage-caching
...
Added lots of caching
2019-11-24 10:19:17 +13:00
Brenda Wallace
a8a522d09e
rubocop style fix
2019-11-24 10:17:55 +13:00
Brenda Wallace
bd2b5c6448
Merge remote-tracking branch 'origin/predict-perenial-harvest' into predict-perenial-harvest
2019-11-24 10:15:53 +13:00
Brenda Wallace
0bb4dbec10
Display of planting neighbours
2019-11-24 10:15:11 +13:00
Brenda Wallace
e40cca806c
World neighbours
2019-11-24 09:44:35 +13:00
codefactor-io
fd744cf67a
[CodeFactor] Apply fixes
2019-11-23 20:44:19 +00:00
Brenda Wallace
70565c7202
show neighbouring plantings same crop
...
also helps see where the prediction came from
2019-11-24 09:43:25 +13:00
codefactor-io
a23963ba96
[CodeFactor] Apply fixes
2019-11-23 19:58:22 +00:00
Brenda Wallace
c0fabc7002
Reducing unnecesary and extra queries
2019-11-24 08:57:34 +13:00
Brenda Wallace
c3d626636b
Added icons so sections line up
2019-11-24 08:49:00 +13:00
Brenda Wallace
1c2a88da55
Added lots of caching
2019-11-24 08:45:23 +13:00
Brenda Wallace
5793f26b6f
stub tests
2019-11-24 08:41:12 +13:00
Brenda Wallace
09a70c4742
Predict month of harvest on perennials
2019-11-23 22:21:36 +13:00
Brenda Wallace
bc31151105
Merge pull request #2283 from Growstuff/dev
...
Production Release
2019-11-23 08:39:51 +13:00
Brenda Wallace
ab1b77ede8
Updated gemlock for ruby version
2019-11-23 08:19:21 +13:00
Brenda Wallace
a645c696f3
Bump ruby version to 2.6.5
2019-11-23 07:59:59 +13:00
Brenda Wallace
9246176ecf
Merge remote-tracking branch 'upstream/dev' into dev
2019-11-23 07:56:17 +13:00
Brenda Wallace
712184fb6e
Bump ruby version to 2.6.5
2019-11-23 07:54:22 +13:00
Brenda Wallace
ab9cf4f3fa
Fix gemfile, so rspec isn't expected in production
2019-11-23 07:52:22 +13:00
Brenda Wallace
7130679744
Added node buildback to heroku config
2019-11-23 07:46:34 +13:00
Brenda Wallace
8449308f41
Set node and yarn versions, so heroku picks good ones
2019-11-23 07:44:06 +13:00
dependabot-preview[bot]
95e2ca9ce0
Bump searchkick from 4.1.0 to 4.1.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.1.0 to 4.1.1.
- [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.1.0...v4.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-21 05:35:16 +00:00
Brenda Wallace
a92710eab7
Update schema
2019-11-19 21:08:47 +13:00
Brenda Wallace
93be74af08
Merge pull request #2278 from Br3nda/api-docs
...
Api docs using swagger
2019-11-19 17:42:45 +13:00
Brenda Wallace
43440657b6
Merge pull request #2281 from Growstuff/dev
...
Production Release
2019-11-19 17:04:33 +13:00
Brenda Wallace
e986b1c60c
Merge branch 'dev' into api-docs
2019-11-19 16:18:24 +13:00
Brenda Wallace
6c35c44786
Merge remote-tracking branch 'upstream/dev' into dev
2019-11-19 16:09:51 +13:00
Brenda Wallace
363d39705a
migration goes up only
2019-11-19 16:09:01 +13:00
Brenda Wallace
5b6bd4e198
Merge pull request #2282 from Br3nda/cms-upgrade
...
Migrate CMS tags
2019-11-19 16:08:37 +13:00
Brenda Wallace
327014ba73
Migrate CMS tags
...
copied from https://github.com/comfy/comfortable-mexican-sofa/wiki/HowTo:-Upgrade-CMS-From-1.12-to-2.0
2019-11-19 16:05:13 +13:00
Brenda Wallace
1eca0de6d9
Merge branch 'dev' into api-docs
2019-11-19 15:36:39 +13:00
Brenda Wallace
1023409f5e
Merge pull request #2280 from Br3nda/cms-upgrade
...
Finish the CMS upgrade and fix #2098
2019-11-19 15:34:55 +13:00
codefactor-io
0ece05ca6b
[CodeFactor] Apply fixes to commit 0958a13
2019-11-19 02:15:15 +00:00
Brenda Wallace
0958a134ed
Finish the CMS upgrade and fix #2098
2019-11-19 15:14:08 +13:00
Brenda Wallace
cf0485c448
fix mobile display
2019-11-19 14:25:14 +13:00
Brenda Wallace
72e348cdf6
Fix up specs
2019-11-19 14:16:50 +13:00
Brenda Wallace
b1bb1a4b95
Corrected path in swagger config
2019-11-19 14:02:03 +13:00
Brenda Wallace
76ee0c1cd8
rubocop lint
2019-11-19 13:58:16 +13:00
Brenda Wallace
6bb7cec35b
Merge remote-tracking branch 'upstream/dev' into api-docs
2019-11-19 13:53:38 +13:00
Brenda Wallace
5db98b5d5b
Merge remote-tracking branch 'origin/api-docs' into api-docs
2019-11-19 13:53:25 +13:00
Brenda Wallace
0c3149205b
Put resources back into namespaces
2019-11-19 13:53:12 +13:00
dependabot-preview[bot]
35c2073bd8
[Security] Bump https-proxy-agent from 2.2.1 to 2.2.4
...
Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent ) from 2.2.1 to 2.2.4. **This update includes security fixes.**
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases )
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-18 21:26:04 +00:00
Brenda Wallace
bcc4b51713
Merge branch 'dev' into api-docs
2019-11-18 19:09:22 +13:00
Brenda Wallace
fa1e70036a
Fix name of spec
2019-11-18 16:06:57 +13:00
dependabot-preview[bot]
46f6cd4fd9
[Security] Bump nokogiri from 1.10.4 to 1.10.5
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.4 to 1.10.5. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-17 23:37:08 +00:00
Brenda Wallace
be4a250c63
renamed files to please rubocop
2019-11-18 11:08:23 +13:00
Brenda Wallace
c6fffebb28
Update specs for new index layout with api docs
2019-11-18 10:50:13 +13:00
Brenda Wallace
8fb4725f46
Merge remote-tracking branch 'upstream/dev' into api-docs
...
Conflicts:
app/resources/api/v1/planting_resource.rb
2019-11-18 10:26:05 +13:00
Brenda Wallace
0823e971ed
Tidy up indexes and add links to data/api
2019-11-18 10:23:07 +13:00
Brenda Wallace
4f8830676e
Swagger docs
2019-11-18 10:15:06 +13:00
Brenda Wallace
818a980f6d
Move jsonapi resources files
2019-11-18 10:11:53 +13:00
dependabot-preview[bot]
0e8a085cce
Bump scout_apm from 2.6.3 to 2.6.4
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.3 to 2.6.4.
- [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.3...v2.6.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-17 07:45:34 +00:00
Brenda Wallace
e096d2be93
Merge pull request #2276 from Growstuff/dev
...
production release
2019-11-17 17:11:43 +13:00
Brenda Wallace
0bc128b01d
Merge pull request #2275 from Br3nda/fix-map-markers
...
Add marker for leaflet maps, and use asset pipeline to serve file
2019-11-17 14:00:09 +13:00
Brenda Wallace
140f625c48
Add new planting api attributes to test
2019-11-16 22:40:06 +13:00
Brenda Wallace
7ea14bccfe
Fix alt on img tag
2019-11-16 22:32:45 +13:00
Brenda Wallace
8d87f3c982
Remove console debug statement
2019-11-16 20:38:43 +13:00
Brenda Wallace
4c82adc612
Added new api items to controller spec
2019-11-16 20:38:15 +13:00
Brenda Wallace
24f970f4f4
Added alt tag
2019-11-16 13:21:42 +13:00
Brenda Wallace
c87ae7be29
add photo to the map, if we have one
2019-11-16 13:20:38 +13:00
Brenda Wallace
1697f3e758
Update model spec for location
2019-11-16 13:07:38 +13:00
Brenda Wallace
df5b0499e4
Update spec for api resource
2019-11-16 13:05:40 +13:00
Brenda Wallace
535ddcdcff
Added plantings to places map
2019-11-16 12:16:18 +13:00
Brenda Wallace
a437338961
Fix markers on crops#show map
2019-11-16 11:35:45 +13:00
Brenda Wallace
66fae333a9
Rename crops js file so it gets included correctly
...
this crops.js.erb file was being ignored because a crops.coffee exists
2019-11-16 11:21:40 +13:00
Brenda Wallace
2b7c21bf2e
Fix marker on member map too
2019-11-16 11:16:53 +13:00
Brenda Wallace
f27cf0caf6
Added link to icon documentation
2019-11-16 11:11:41 +13:00
Brenda Wallace
df55a5b0a8
Add marker for leaflet maps, and use asset pipeline to serve file
2019-11-16 10:42:22 +13:00
Brenda Wallace
1dec690951
Merge pull request #2273 from Growstuff/dev
...
production release
2019-11-15 12:55:19 +13:00
Brenda Wallace
69d9e1e76e
Merge pull request #2271 from Br3nda/jump-to-garden
...
Link to jump to garden
2019-11-15 12:16:39 +13:00
Brenda Wallace
e127832d37
Merge pull request #2272 from Br3nda/ordering
...
Order the garden names
2019-11-15 12:16:23 +13:00
Brenda Wallace
cfef6f5eb2
Link to jump to garden
2019-11-15 11:47:32 +13:00
Brenda Wallace
75037c7e21
Order the garden names
2019-11-15 11:32:13 +13:00
Brenda Wallace
856d975551
Merge pull request #2269 from Growstuff/dev
...
Production release
2019-11-13 11:44:01 +13:00
dependabot-preview[bot]
a4659f141a
Bump rake from 13.0.0 to 13.0.1
...
Bumps [rake](https://github.com/ruby/rake ) from 13.0.0 to 13.0.1.
- [Release notes](https://github.com/ruby/rake/releases )
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc )
- [Commits](https://github.com/ruby/rake/compare/v13.0.0...v13.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-12 08:13:20 +00:00
dependabot-preview[bot]
476f068807
Bump omniauth-flickr from 0.0.19 to 0.0.20
...
Bumps [omniauth-flickr](https://github.com/timbreitkreutz/omniauth-flickr ) from 0.0.19 to 0.0.20.
- [Release notes](https://github.com/timbreitkreutz/omniauth-flickr/releases )
- [Commits](https://github.com/timbreitkreutz/omniauth-flickr/compare/v0.0.19...v0.0.20 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-12 01:10:16 +00:00
Brenda Wallace
6bd53094ba
Merge pull request #2267 from Growstuff/imgbot
...
[ImgBot] Optimize images
2019-11-11 19:00:15 +13:00
ImgBotApp
be884ad1fb
[ImgBot] Optimize images
...
*Total -- 24.17kb -> 22.54kb (6.78%)
/app/assets/images/icons/timeline.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/finished.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/planting-add.svg -- 2.81kb -> 2.52kb (10.45%)
/app/assets/images/icons/seed-add.svg -- 4.21kb -> 3.91kb (7.07%)
/app/assets/images/icons/sprout-add.svg -- 3.81kb -> 3.58kb (6%)
/app/assets/images/icons/seeds.svg -- 3.45kb -> 3.29kb (4.69%)
/app/assets/images/icons/harvest-add.svg -- 4.98kb -> 4.78kb (3.9%)
/app/assets/images/icons/trade.svg -- 0.91kb -> 0.89kb (2.14%)
Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com >
2019-11-11 05:00:09 +00:00
Brenda Wallace
130febb735
Change regex not letting utf-8 garden names save ( #1641 )
...
* Remove regex not letting utf-8 garden names save
closes #1634
2019-11-11 17:59:41 +13:00
Brenda Wallace
b8b579a5ba
rubycop fix up
2019-11-11 17:45:37 +13:00
codefactor-io
e0ea039347
[CodeFactor] Apply fixes to commit a651f07
2019-11-11 04:42:30 +00:00
Brenda Wallace
a651f079d8
Simplify garden.name validation regexp
2019-11-11 17:41:46 +13:00
Brenda Wallace
cfaa18daaf
Merge remote-tracking branch 'upstream/dev' into UTFGardenNames
2019-11-11 14:14:34 +13:00
dependabot-preview[bot]
9b15b42cbd
[Security] Bump chartkick from 3.2.2 to 3.3.0
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.2.2 to 3.3.0. **This update includes a security fix.**
- [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.2.2...v3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-10 09:44:33 +00:00
dependabot-preview[bot]
5cb00f4423
Bump puma from 4.2.1 to 4.3.0
...
Bumps [puma](https://github.com/puma/puma ) from 4.2.1 to 4.3.0.
- [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.1...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-08 23:32:20 +00:00
dependabot-preview[bot]
e617d2aac9
Bump faker from 2.6.0 to 2.7.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-06 09:18:10 +00:00
dependabot-preview[bot]
bdfce436b4
Bump scout_apm from 2.6.2 to 2.6.3
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.2 to 2.6.3.
- [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.2...v2.6.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-06 08:48:02 +00:00
Brenda Wallace
74d4f19203
Merge pull request #2261 from Growstuff/dev
...
Production Release
2019-11-05 13:16:29 +13:00
Brenda Wallace
a4b7ded8a3
Merge pull request #2260 from Br3nda/all-varieties
...
show all varieties (including grandchildren)
2019-11-05 11:12:42 +13:00
Brenda Wallace
405de0fb18
Merge branch 'dev' into all-varieties
2019-11-02 13:21:30 +13:00
Brenda Wallace
1f8ef86053
Merge pull request #2258 from Growstuff/dev
...
Production release
2019-11-01 22:13:39 +13:00
Brenda Wallace
01d974f9ee
Merge pull request #2259 from Br3nda/parent-seed
...
Specs for linking plantings to seeds
2019-11-01 22:13:20 +13:00
Brenda Wallace
d0bee45c0c
show all varieties (including grandchildren)
2019-11-01 21:33:43 +13:00
Brenda Wallace
c27622803d
Specs for linking plantings to seeds
2019-11-01 17:18:51 +13:00
Brenda Wallace
b214f7ad8d
linking existing plantings to their parent seeds
2019-11-01 02:23:14 +00:00
dependabot-preview[bot]
2cb438f15d
Bump rubocop from 0.75.1 to 0.76.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.75.1 to 0.76.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.75.1...v0.76.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-01 00:25:00 +00:00
Brenda Wallace
6b023de063
Merge pull request #2255 from Growstuff/dev
...
Production release
2019-10-29 13:26:43 +13:00
Brenda Wallace
91fa8e6a62
Merge pull request #2254 from Br3nda/seeds
...
tidy up display of seeds
2019-10-29 11:25:57 +13:00
Brenda Wallace
585406ad11
Merge branch 'dev' into seeds
2019-10-28 22:19:50 +13:00
Brenda Wallace
2f2169f89a
tidy up display of seeds
2019-10-28 22:12:08 +13:00
dependabot-preview[bot]
b24beae9af
Bump chartkick from 3.2.1 to 3.2.2
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.2.1 to 3.2.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.2.1...v3.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-28 08:53:06 +00:00
dependabot-preview[bot]
42e4d24004
Bump sidekiq from 6.0.2 to 6.0.3
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.2 to 6.0.3.
- [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.2...v6.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-28 08:33:50 +00:00
Brenda Wallace
e472e1cd14
Merge pull request #2248 from Growstuff/dev
...
Production release
2019-10-27 14:09:44 +13:00
Brenda Wallace
a9f3125191
Merge pull request #2249 from Br3nda/weeks
...
planting time line week by week
2019-10-27 13:22:48 +13:00
Brenda Wallace
b2e90cddc6
Merge branch 'dev' into weeks
2019-10-25 13:41:30 +13:00
André Aubin
279d85456b
Switching gravatar urls to secure subdomain
2019-10-24 23:51:52 +00:00
André Aubin
a3fa774d84
Force ssl on gravatar-ultimate gem
2019-10-24 23:51:52 +00:00
André Aubin
15608fc86a
Update Contributors.md
2019-10-24 23:51:52 +00:00
André Aubin
66045866b3
Switch to HTTPS for Gravatar urls
2019-10-24 23:51:52 +00:00
Brenda Wallace
8cf5acc30a
Update spec to expect weeks to be rounded
2019-10-25 07:42:13 +13:00
Brenda Wallace
9d232e26cb
Update app/views/crops/_predictions.html.haml
2019-10-25 06:42:00 +13:00
Brenda Wallace
d96b30fff8
spec for in_weeks method
2019-10-24 21:06:28 +13:00
Brenda Wallace
2d6d02d0b3
added in_weeks helper
2019-10-24 21:03:30 +13:00
Brenda Wallace
358631d0f9
update spec to look for weeks
2019-10-24 20:58:27 +13:00
Brenda Wallace
95ae4d41ba
rounding on weeks
2019-10-24 20:58:13 +13:00
Brenda Wallace
627d97155f
Tidy up
2019-10-24 19:59:18 +13:00
Brenda Wallace
329262e2f5
show "finished" when planting is finished
2019-10-24 19:45:08 +13:00
Brenda Wallace
5d4f1abacd
show unknown date when unknown finish date
2019-10-24 19:44:58 +13:00
Brenda Wallace
f7f3ac695f
better name for css class progress-fade
2019-10-24 19:16:41 +13:00
Brenda Wallace
a1479c9126
fixed call to missing method
2019-10-24 19:13:41 +13:00
Brenda Wallace
dfe533dda1
DRY and tidy
2019-10-24 19:13:20 +13:00
Brenda Wallace
f4c4e1c93f
Collapse crop card content
2019-10-24 19:10:44 +13:00
Brenda Wallace
1a0e30491f
Removed unused methods
2019-10-24 19:04:37 +13:00
Brenda Wallace
053a33cd72
Removed commented out code
2019-10-24 18:58:50 +13:00
Brenda Wallace
0cc62c2b98
show planted_at, even when we can't predict finish
2019-10-24 18:57:16 +13:00
Brenda Wallace
c094b5daf9
Update spec, to look for new emojii timeline
2019-10-24 18:55:47 +13:00
Brenda Wallace
38713af603
plantings timeline with icons
2019-10-24 16:36:16 +13:00
Brenda Wallace
dc3a730064
update spec to use expect syntax
2019-10-24 16:15:06 +13:00
dependabot-preview[bot]
85634fc43b
Bump factory_bot_rails from 5.1.0 to 5.1.1
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.1.0...v5.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-23 08:58:12 +00:00
dependabot-preview[bot]
9de1d02cb1
Bump loofah from 2.3.0 to 2.3.1
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.3.0 to 2.3.1.
- [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.3.0...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-23 08:27:33 +00:00
Brenda Wallace
d5d0c9e132
Merge pull request #2224 from Br3nda/search
...
Show more results in search
2019-10-23 21:06:10 +13:00
Brenda Wallace
ae48844d87
Merge branch 'dev' into search
2019-10-23 15:55:27 +13:00
Brenda Wallace
3ef85ac2f6
Merge pull request #2221 from Br3nda/planting-reminders
...
📧 Polish planting reminders stylings and data
2019-10-23 15:55:10 +13:00
Brenda Wallace
19cb89be1e
Merge branch 'dev' into planting-reminders
2019-10-23 09:24:56 +13:00
dependabot-preview[bot]
603251de75
Bump selenium-webdriver from 3.142.4 to 3.142.6
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.4 to 3.142.6.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 19:07:56 +00:00
Brenda Wallace
f4f9f8626c
Merge branch 'dev' into search
2019-10-23 07:46:05 +13:00
Brenda Wallace
8b7697c6d6
Merge branch 'dev' into planting-reminders
2019-10-23 07:45:24 +13:00
dependabot-preview[bot]
b69baa8b22
Bump rspec-rails from 3.8.2 to 3.9.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 18:43:28 +00:00
dependabot-preview[bot]
9b4ead388b
Bump rake from 12.3.3 to 13.0.0
...
Bumps [rake](https://github.com/ruby/rake ) from 12.3.3 to 13.0.0.
- [Release notes](https://github.com/ruby/rake/releases )
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc )
- [Commits](https://github.com/ruby/rake/compare/v12.3.3...v13.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 14:56:52 +00:00
dependabot-preview[bot]
4fa803a40d
Bump listen from 3.1.5 to 3.2.0
...
Bumps [listen](https://github.com/guard/listen ) from 3.1.5 to 3.2.0.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.1.5...v3.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 14:14:57 +00:00
dependabot-preview[bot]
ebe3c9c0e6
Bump faker from 2.4.0 to 2.6.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.4.0 to 2.6.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.4.0...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 13:04:42 +00:00
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
Brenda Wallace
e1dfd122d4
Merge pull request #2235 from Growstuff/dev
...
Production release
2019-10-22 22:44:55 +13: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
c6f4eef291
Show more results in searches
2019-10-21 16:24:31 +13:00
Brenda Wallace
440499530b
Merge pull request #2223 from Growstuff/dev
...
Production release
2019-10-21 16:23:13 +13:00
Brenda Wallace
6d6d1930d1
Merge branch 'dev' into planting-reminders
2019-10-21 15:53:25 +13: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
798883be1c
Typo/spelling fix
2019-10-21 14:45:21 +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
7517abd1f3
Merge remote-tracking branch 'origin/planting-reminders' into planting-reminders
2019-10-21 14:23:03 +13:00
Brenda Wallace
8cdae6647d
Merge remote-tracking branch 'upstream/dev' into planting-reminders
2019-10-21 14:20:45 +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
edea87ab5d
Merge branch 'dev' into planting-reminders
2019-10-21 12:33:58 +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
e1faedfc78
Merge branch 'dev' into planting-reminders
2019-10-20 21:36:42 +13:00
Brenda Wallace
ca11792286
Only show companions of active plantings
2019-10-20 14:13:30 +13:00
Brenda Wallace
94452ee62e
polish up the plantings reminders
2019-10-20 14:12:34 +13:00
Brenda Wallace
e0dc38e7a3
add perennials
2019-10-20 09:49:03 +13:00
Brenda Wallace
4af89d2b2c
Change reminder email into monthly summary
2019-10-20 09:49:03 +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
Brenda Wallace
21848bf5b4
Merge branch 'dev' into role-admin
2019-10-19 09:42:49 +13:00
Brenda Wallace
a6cb81f4d1
Widen gardens on gardens#index
2019-10-19 09:41:43 +13:00
Brenda Wallace
80b82a99fe
Fix broken spec on dev
2019-10-19 09:41:09 +13:00
Brenda Wallace
88a771459c
Merge branch 'dev' into role-admin
2019-10-18 09:43:44 +13:00
Brenda Wallace
fd39d6ef8c
More per page
2019-10-08 15:54:53 +13:00
codefactor-io
6d472c5d66
[CodeFactor] Apply fixes
2019-10-07 23:35:39 +00:00
Brenda Wallace
f77a0e37b9
Merge branch 'dev' into role-admin
2019-10-08 11:22:13 +13:00
Brenda Wallace
ca0915585c
Merge pull request #2193 from Growstuff/dev
...
Production release
2019-10-08 11:21:18 +13:00
Brenda Wallace
b0c8b11246
📝 Inline editing and display tidy ups ( #2200 )
...
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
bestest-mensch
d72ec5890a
address code climate issues
2019-10-07 21:38:19 +00:00
bestest-mensch
1e1b9f5ef5
scope conversations delete multiple to current user
2019-10-07 21:38:19 +00:00
bestest-mensch
9f8e2e65be
update/add specs
2019-10-07 21:38:19 +00:00
bestest-mensch
80fb4f5fe6
add ability to delete multiple conversations at once
2019-10-07 21:38:19 +00:00
bestest-mensch
01df35e5a6
update contributors
2019-10-06 04:08:09 +00:00
bestest-mensch
d39dc65c4e
small ui tweak
2019-10-06 04:08:09 +00:00
Brenda Wallace
3422a0d899
Administer member's roles
2019-10-06 14:19:39 +13:00
Brenda Wallace
f297fdc677
Inline editing and display tidy ups
2019-10-05 20:58:00 +13:00
Brenda Wallace
0a71807237
Stop using rails-assets.org ( #2194 )
2019-09-28 18:38:58 +12:00
Brenda Wallace
3eb30a5555
Removed duplicate crop info
2019-09-28 17:44:37 +12:00
Brenda Wallace
7b5698f977
👩🌾 Import openfarm data ( #2177 )
...
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
2019-09-28 17:23:25 +12:00
Brenda Wallace
6a4158ae04
👭 Crop companions ( #2176 )
...
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
2019-09-28 10:38:01 +12:00
dependabot-preview[bot]
e043199866
Bump uglifier from 4.1.20 to 4.2.0
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.20 to 4.2.0.
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-27 16:20:37 +00:00
Brenda Wallace
eaa6ecec98
Merge pull request #2179 from Br3nda/post-comments
...
🚝 Crop to post relationship made more rails standard
2019-09-27 08:14:47 +12:00
Brenda Wallace
9c0c0eeb18
Merge branch 'dev' into post-comments
2019-09-27 08:13:33 +12:00
Brenda Wallace
66a3b2c52b
If we delete a photo, delete the associations records
2019-09-27 08:13:07 +12:00
Brenda Wallace
99e2ca4920
If a crop is deleted, delete association (gerund) records too
2019-09-27 08:13:07 +12:00
Brenda Wallace
719fec24d0
if someone is destroy, delete all likes
2019-09-27 08:13:07 +12:00
Brenda Wallace
f7f7638540
Merge branch 'dev' into post-comments
2019-09-26 21:52:47 +12:00
dependabot-preview[bot]
8dc56c48e2
Bump scout_apm from 2.6.0 to 2.6.1
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.0 to 2.6.1.
- [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.0...v2.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-26 21:51:55 +12:00
Brenda Wallace
e08daa0b2b
Merge branch 'dev' into post-comments
2019-09-26 21:51:17 +12:00
Brenda Wallace
5072353293
Only save location (used for post-signin redirect) if this is a format html page
2019-09-26 21:50:42 +12:00
dependabot-preview[bot]
bcb2464b53
Bump friendly_id from 5.2.5 to 5.3.0
...
Bumps [friendly_id](https://github.com/norman/friendly_id ) from 5.2.5 to 5.3.0.
- [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.2.5...5.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-26 09:48:38 +00:00
Brenda Wallace
685fddb2be
Merge remote-tracking branch 'origin/post-comments' into post-comments
2019-09-26 21:14:53 +12:00
Brenda Wallace
7acdc6c96f
Merge remote-tracking branch 'upstream/dev' into post-comments
...
Conflicts:
db/schema.rb
2019-09-26 21:14:12 +12:00
dependabot-preview[bot]
758db158cb
Bump font-awesome-sass from 5.10.2 to 5.11.2
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.10.2 to 5.11.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.10.2...5.11.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-26 09:08:48 +00:00
Brenda Wallace
5da0f1fda0
Merge pull request #2175 from Br3nda/photo-sources
...
📸 Add source to photos
2019-09-26 20:42:19 +12:00
Brenda Wallace
ee093db0e6
Merge branch 'dev' into photo-sources
2019-09-25 10:30:19 +12:00
dependabot-preview[bot]
17b468d440
Bump factory_bot_rails from 5.0.2 to 5.1.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.0.2...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-24 10:21:36 +00:00
Brenda Wallace
93921a9a23
Merge pull request #2166 from Growstuff/dev
...
Production release
2019-09-24 19:10:57 +12:00
dependabot-preview[bot]
61bede6031
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-09-23 11:03:58 +00:00
dependabot-preview[bot]
743d10e098
Bump puma from 4.1.1 to 4.2.0
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.1 to 4.2.0.
- [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.1.1...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-23 10:36:37 +00:00
Brenda Wallace
fab9560c46
Apply suggestions from code review
2019-09-22 13:22:02 +12:00
Brenda Wallace
90035e79b8
Crop to post relationship made more rails standard
2019-09-22 10:07:50 +12:00
Brenda Wallace
5fab14dc8a
Fixed associations view
2019-09-21 10:28:52 +12:00
Brenda Wallace
87e1a7571b
Photo source in the schema
2019-09-21 09:45:34 +12:00
Brenda Wallace
60ceef4fce
Only show photo associations if we have any
2019-09-21 09:43:36 +12:00
Brenda Wallace
367377088b
Fix specs for photo sources
2019-09-21 09:37:55 +12:00
Brenda Wallace
c97e380187
Merge branch 'dev' into photo-sources
2019-09-20 22:37:02 +12:00
Brenda Wallace
b7321ed46f
Add source to photos
2019-09-20 22:26:39 +12:00
dependabot-preview[bot]
9e216e3ae9
Bump font-awesome-sass from 5.9.0 to 5.10.2
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.9.0 to 5.10.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.9.0...5.10.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-20 10:24:20 +00:00
dependabot-preview[bot]
2fc34bf612
Bump faker from 2.3.0 to 2.4.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.3.0...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-20 09:55:40 +00:00
dependabot-preview[bot]
c19bf8ea72
Bump faker from 2.2.2 to 2.3.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.2 to 2.3.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.2...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-14 11:45:44 +00:00
dependabot-preview[bot]
835f831e26
Bump puma from 4.1.0 to 4.1.1
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.0 to 4.1.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.1.0...v4.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-14 11:17:32 +00:00
Brenda Wallace
1c192bd51d
Fixing apt install errors on travis runs ( #2171 )
2019-09-14 22:43:19 +12:00
Brenda Wallace
8fae9a225b
Comment out chromium
2019-09-14 11:26:49 +12:00
dependabot-preview[bot]
64066e1556
Bump scout_apm from 2.5.2 to 2.6.0
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.5.2 to 2.6.0.
- [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.5.2...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-12 11:30:25 +00:00
dependabot-preview[bot]
413d759ce5
Bump faker from 2.2.1 to 2.2.2
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.1...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-10 04:39:45 +00:00
Brenda Wallace
3cbb79981e
Merge pull request #2152 from Br3nda/display
...
🗑️ Removing unused styles
2019-09-10 00:25:07 +12:00
Brenda Wallace
1a0cd5f7a7
Merge pull request #2150 from Br3nda/fix/2106-followers
...
🤗 Allow anyone to view followers - and tidy up display
2019-09-10 00:24:31 +12:00
dependabot-preview[bot]
012b8a4ec0
Bump devise from 4.7.0 to 4.7.1
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.0...v4.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-09 12:23:44 +00:00
dependabot-preview[bot]
43f35ac6df
Bump newrelic_rpm from 6.5.0.357 to 6.6.0.358
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.5.0.357 to 6.6.0.358.
- [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.5.0.357...6.6.0.358 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-06 23:13:26 +00:00
Brenda Wallace
29643810fe
Merge branch 'dev' into display
2019-09-05 12:07:17 +12:00
Brenda Wallace
c7e4883332
Update README.md
2019-09-05 12:04:32 +12:00
Brenda Wallace
f28958be18
Merge branch 'dev' into fix/2106-followers
2019-09-05 12:02:13 +12:00
Brenda Wallace
2d6c022d43
Merge branch 'dev' into display
2019-09-05 10:13:54 +12:00
Brenda Wallace
f3ac6c9a37
Merge pull request #2151 from Br3nda/fix/2105-padding
...
Section padding
2019-09-05 10:13:28 +12:00
Brenda Wallace
cbbf84b305
Merge branch 'dev' into fix/2106-followers
2019-09-05 10:13:15 +12:00
Brenda Wallace
dcc9e3edf3
Merge branch 'dev' into fix/2105-padding
2019-09-04 17:16:37 +12:00
dependabot-preview[bot]
fedfd4fd08
Bump capybara from 3.28.0 to 3.29.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.28.0 to 3.29.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.28.0...3.29.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-03 09:55:52 +00:00
dependabot-preview[bot]
95c7fa2d93
Bump sidekiq from 5.2.7 to 6.0.0
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.7 to 6.0.0.
- [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/v5.2.7...v6.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 13:27:11 +00:00
dependabot-preview[bot]
64f2d208d4
Bump selenium-webdriver from 3.142.3 to 3.142.4
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.3 to 3.142.4.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 13:06:32 +00:00
dependabot-preview[bot]
6af25d2d63
Bump rubocop-rails from 2.3.1 to 2.3.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.1...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 12:38:25 +00:00
dependabot-preview[bot]
1ad256efa2
Bump csv_shaper from 1.3.0 to 1.3.1
...
Bumps [csv_shaper](https://github.com/paulspringett/csv_shaper ) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/paulspringett/csv_shaper/releases )
- [Commits](https://github.com/paulspringett/csv_shaper/compare/v1.3.0...v1.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 11:59:28 +00:00
dependabot-preview[bot]
a866c1f991
Bump oj from 3.9.0 to 3.9.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.0 to 3.9.1.
- [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.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 11:15:22 +00:00
dependabot-preview[bot]
82e2b56b0d
Bump faker from 2.2.0 to 2.2.1
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.0...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 10:09:06 +00:00
Brenda Wallace
f16921d994
Remove extra whitespace
2019-09-01 21:22:59 +12:00
Brenda Wallace
4e9ba4f438
Merge css class
2019-09-01 20:50:57 +12:00
Brenda Wallace
a50b0485ac
find button by class
2019-09-01 20:46:46 +12:00
Brenda Wallace
f121f7f3fe
Place map on a high zindex, but below the menu
2019-09-01 20:41:12 +12:00
Brenda Wallace
c53015b922
Scss lint
2019-09-01 20:34:34 +12:00
Brenda Wallace
c122aa41d3
Scss lint
2019-09-01 20:30:19 +12:00
Brenda Wallace
2c75f62caf
Avoid using id selectors
2019-09-01 20:23:59 +12:00
Brenda Wallace
017a942a41
Rename classes to name codeclimate happy
2019-09-01 19:58:47 +12:00
Brenda Wallace
e4908fe299
Removing unused styles
2019-09-01 19:15:34 +12:00
Brenda Wallace
2a55f61a4c
Section padding
...
fixes #2105
2019-09-01 16:29:54 +12:00
Brenda Wallace
5ded29ef7c
Allow anyone to view followers - and tidy up display
...
fixes #2106
2019-08-31 14:25:31 +12:00
Brenda Wallace
777408a6dc
Merge branch 'dev' into UTFGardenNames
2019-08-29 13:53:04 +12:00
dependabot-preview[bot]
22549c5b12
Bump faker from 2.1.2 to 2.2.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.2 to 2.2.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.2...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-29 01:52:28 +00:00
Brenda Wallace
0744c35fdd
Merge pull request #2148 from Growstuff/dev
...
Production release
2019-08-28 16:53:05 +12:00
dependabot-preview[bot]
f3bd2e978d
Bump rubocop-rails from 2.3.0 to 2.3.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-26 08:38:55 +00:00
dependabot-preview[bot]
5b762dac85
Bump rack-protection from 2.0.6 to 2.0.7
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.6...v2.0.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-23 18:04:11 +00:00
dependabot-preview[bot]
c5aba387fe
Bump rack-protection from 2.0.5 to 2.0.6
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.5 to 2.0.6.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.5...v2.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-22 13:00:05 +00:00
dependabot-preview[bot]
8dfa2cb777
Bump bullet from 6.0.1 to 6.0.2
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.1...6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-21 11:19:08 +00:00
Brenda Wallace
39fde4e7c9
Merge pull request #2139 from Growstuff/dev
...
Production release
2019-08-21 09:17:57 +12:00
Brenda Wallace
e3f32d8bb4
Updated specs
2019-08-20 15:09:39 +00:00
Brenda Wallace
c6d4563edc
Updated spec
2019-08-20 15:09:39 +00:00
Brenda Wallace
99228d8850
Add css class, so can find in test
2019-08-20 15:09:39 +00:00
Brenda Wallace
ed4aaa1c9c
Tidy up admin landing page
2019-08-20 15:09:39 +00:00
Brenda Wallace
4241a7c5f5
Tidy up crop wrangling page
2019-08-20 15:09:39 +00:00
Brenda Wallace
b3520a1b3f
Search for members in admin/members#index
2019-08-20 15:09:39 +00:00
dependabot-preview[bot]
a792b5933f
Bump devise from 4.6.2 to 4.7.0
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.6.2 to 4.7.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.2...v4.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-20 14:30:07 +00:00
pozorvlak
ee59a7a35c
Merge pull request #2133 from Br3nda/fix/feature-spec-sessions
...
Fix/feature spec sessions
2019-08-20 15:10:42 +01:00
pozorvlak
61d0a6e635
Merge branch 'dev' into fix/feature-spec-sessions
2019-08-20 14:51:27 +01:00
dependabot-preview[bot]
5ecc010cf5
Bump sass-rails from 5.0.7 to 5.1.0
...
Bumps [sass-rails](https://github.com/rails/sass-rails ) from 5.0.7 to 5.1.0.
- [Release notes](https://github.com/rails/sass-rails/releases )
- [Commits](https://github.com/rails/sass-rails/compare/v5.0.7...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-20 10:44:54 +00:00
dependabot-preview[bot]
715f111182
Bump will_paginate from 3.1.7 to 3.1.8
...
Bumps [will_paginate](https://github.com/mislav/will_paginate ) from 3.1.7 to 3.1.8.
- [Release notes](https://github.com/mislav/will_paginate/releases )
- [Commits](https://github.com/mislav/will_paginate/compare/v3.1.7...v3.1.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-20 10:17:24 +00:00
dependabot-preview[bot]
ba224bacbd
Bump oj from 3.8.1 to 3.9.0
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.8.1 to 3.9.0.
- [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.8.1...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-19 19:42:08 +00:00
dependabot-preview[bot]
a7735e77d1
Bump haml_lint from 0.32.0 to 0.33.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.32.0 to 0.33.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.32.0...v0.33.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-19 18:55:09 +00:00
Brenda Wallace
6782765581
Merge branch 'fix/feature-spec-sessions' of github.com:br3nda/growstuff into fix/feature-spec-sessions
2019-08-19 09:21:34 +12:00
Brenda Wallace
fa5b2eea32
DRY spec
2019-08-19 09:21:28 +12:00
Brenda Wallace
e48dae006b
Delete notifications_spec.rb
2019-08-18 20:15:55 +12:00
Brenda Wallace
38477c9bfd
Wrap admin in context
2019-08-18 16:15:47 +12:00
Brenda Wallace
34b399cd8e
Use more signed in contexts in browse crops spec
...
More member role contexts on alt name spec
More member role contexts in crop feature specs
Don't wrap the shared_context
2019-08-18 16:10:03 +12:00
Brenda Wallace
c6894e7917
Setting linters as require: false in gemfile
2019-08-18 14:51:46 +12:00
Brenda Wallace
756cf1fe3a
Removing unused code in specs
2019-08-18 14:51:24 +12:00
Brenda Wallace
f3346fcadf
Add rspectre gem
2019-08-18 14:31:51 +12:00
Brenda Wallace
626ad68bba
Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions
2019-08-17 19:21:31 +12:00
Brenda Wallace
a334ea03bf
fix spec
2019-08-17 19:20:43 +12:00
Brenda Wallace
8595dbe7aa
Merge pull request #2134 from Br3nda/debug-migration
...
[HOTFIX] Send message to everyone in migration (no email tho)
2019-08-17 16:14:23 +12:00
Brenda Wallace
586bc21e93
Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions
...
Conflicts:
spec/features/members/profile_spec.rb
spec/features/notifications_spec.rb
spec/features/percy/percy_spec.rb
2019-08-17 16:09:32 +12:00
Brenda Wallace
cbe5871369
Send message to everyone in migration (no email tho)
2019-08-17 16:00:18 +12:00
Brenda Wallace
23c6c3059f
Merge pull request #2103 from Br3nda/mailbox
...
Rewriting messages functionality to use mail boxer
2019-08-17 15:33:30 +12:00
Brenda Wallace
a74891f97f
Fix spec
2019-08-17 15:30:45 +12:00
Brenda Wallace
7a21ec31d9
wrap context in spec
2019-08-17 15:12:29 +12:00
Brenda Wallace
27d4ebda51
make sure there's a member to find in specs
2019-08-17 15:01:34 +12:00
Brenda Wallace
a993eadea9
fix spec
2019-08-17 14:43:39 +12:00
Brenda Wallace
b2d8818ae1
don't notify wranglers if there are none
2019-08-17 14:43:32 +12:00
Brenda Wallace
1cb0096788
fixed specs
2019-08-17 14:38:43 +12:00
Brenda Wallace
a36d149125
sign in as member with location
2019-08-17 14:35:39 +12:00
Brenda Wallace
c1deed70ad
Keep username consistent in specs
2019-08-17 14:32:18 +12:00
Brenda Wallace
b6f61a9af3
Merge branch 'dev' into mailbox
2019-08-17 14:27:38 +12:00
Brenda Wallace
34d9d33ed6
Merge pull request #2124 from Growstuff/dev
...
production release
2019-08-17 14:27:02 +12:00
Brenda Wallace
aa17f8e332
Removed unused let()
2019-08-17 14:17:05 +12:00
Brenda Wallace
b49b7b563c
Added logout after like spec
2019-08-17 14:14:58 +12:00
Brenda Wallace
8936933251
Shared context for signing in (and then out) in feature specs
2019-08-17 14:10:56 +12:00
Brenda Wallace
e27cf02d96
Shared context for signing in/out on feature specs
2019-08-16 13:49:31 +12:00
dependabot-preview[bot]
f90a29a7a5
Bump scout_apm from 2.5.1 to 2.5.2
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.5.1 to 2.5.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.5.1...v2.5.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-14 20:00:09 +00:00
dependabot-preview[bot]
8489109a87
Bump faker from 2.1.0 to 2.1.2
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.0...v2.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-13 20:12:04 +00:00
dependabot-preview[bot]
b7b260d8f8
Bump rubocop-rails from 2.2.1 to 2.3.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.2.1...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-13 19:53:23 +00:00
Brenda Wallace
c173d359d8
Split up giant member model
2019-08-12 10:00:21 +12:00
Brenda Wallace
c77742abab
Wrapped long line
2019-08-12 09:51:05 +12:00
Brenda Wallace
295eb57a86
Merge branch 'dev' into mailbox
2019-08-12 09:42:55 +12:00
Brenda Wallace
522bec7775
Merge pull request #2129 from Growstuff/awesomecode-lint-ruby-space-36545
...
Auto corrected by following Lint Ruby Space
2019-08-12 09:42:29 +12:00
Brenda Wallace
df87a79ab6
Only send email if user wants them
2019-08-12 09:40:53 +12:00
Awesome Code
924e96eda1
Auto corrected by following Lint Ruby Space
2019-08-11 21:39:46 +00:00
dependabot-preview[bot]
0dfe8abd51
[Security] Bump nokogiri from 1.10.3 to 1.10.4
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.3 to 1.10.4. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.3...v1.10.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-11 21:38:33 +00:00
Brenda Wallace
222400d4e1
links to member from conversations#index
2019-08-11 20:55:20 +12:00
Brenda Wallace
109f9af0b9
Unread counts
2019-08-11 17:04:52 +12:00
Brenda Wallace
c189e4ed3d
Bigger envelope icons on conversations#index
2019-08-11 16:55:32 +12:00
Brenda Wallace
44d8cd0f63
Copy timestamps from Notifications to Conversations
2019-08-11 16:55:15 +12:00
Brenda Wallace
11ef0fb694
Removed test for unused method
2019-08-11 16:31:51 +12:00
Brenda Wallace
e01b53fd9b
Remove extra validators on notification
...
We are migrating away from here
2019-08-11 15:52:11 +12:00
Brenda Wallace
3c073a950a
Reducing size of member model
2019-08-11 15:50:48 +12:00
Brenda Wallace
c4b33db495
Mark read notifications as read after migrating to conversations
2019-08-11 15:50:36 +12:00
Brenda Wallace
031734bb7f
shorten method
2019-08-11 14:24:43 +12:00
Brenda Wallace
3976d1a982
Shorten method
2019-08-11 14:24:17 +12:00
Brenda Wallace
105c2639e4
Adding timestamps to tables
2019-08-11 14:23:27 +12:00
Brenda Wallace
4f74b20565
Migrate from notifications to conversations without sending emails
2019-08-11 14:17:30 +12:00
Brenda Wallace
0d370603b7
Rename spec from Notifications to Conversations
2019-08-11 13:39:00 +12:00
Brenda Wallace
2a3563f9fd
Migration from notifications to mailboxer
2019-08-11 13:37:56 +12:00
Brenda Wallace
5d7ef7e861
rubocop lint
2019-08-10 17:30:41 +12:00
Brenda Wallace
083d7c09e6
Migration of notifications to mailboxer, without sending new emails
2019-08-10 17:30:24 +12:00
Brenda Wallace
d76c77d176
Merge branch 'dev' into mailbox
2019-08-10 16:34:43 +12:00
Brenda Wallace
f676054cd6
switch to member.discard
2019-08-10 16:09:57 +12:00
Brenda Wallace
82a3cc35a4
Fix member discarding to match specs
2019-08-10 15:43:06 +12:00
Brenda Wallace
1872bff346
Restore notifier
...
not hooked up to mailboxer yet
2019-08-10 12:09:23 +12:00
Brenda Wallace
b3807100d1
fixes email sending
2019-08-10 11:47:45 +12:00
Brenda Wallace
d4644ccdf8
Added join to members to fix error caused by discard gem
2019-08-10 11:37:52 +12:00
Brenda Wallace
5226eadfd8
fix crop join to members
2019-08-10 11:07:12 +12:00
Brenda Wallace
843e15a107
Removed notification view spec
2019-08-10 10:53:20 +12:00
Brenda Wallace
86540c3352
Removed feature plantings code and spec
...
because it's not used
2019-08-10 10:52:49 +12:00
Brenda Wallace
0a919d8599
Remove notifications spec
2019-08-10 10:50:57 +12:00
Brenda Wallace
c137d5e285
update signin spec to use messages and converations
2019-08-10 10:48:48 +12:00
Brenda Wallace
9de51d8a9a
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-08-10 10:39:59 +12:00
Brenda Wallace
c29f0c15ee
don't join to owners when fetching gardens
...
discard isn't the same
2019-08-10 10:39:40 +12:00
dependabot-preview[bot]
b726d0c9bf
Bump puma from 4.0.1 to 4.1.0
...
Bumps [puma](https://github.com/puma/puma ) from 4.0.1 to 4.1.0.
- [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.0.1...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-09 21:16:24 +00:00
Brenda Wallace
2764c3f0e0
Merge branch 'dev' into mailbox
2019-08-09 22:33:22 +12:00
Brenda Wallace
1dfbecfac0
Don't re-look up planting
2019-08-09 22:32:36 +12:00
dependabot-preview[bot]
b33ab3bd71
Bump js-routes from 1.4.7 to 1.4.9
...
Bumps [js-routes](https://github.com/railsware/js-routes ) from 1.4.7 to 1.4.9.
- [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.7...v1.4.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-08 00:01:50 +00:00
Brenda Wallace
b04bdd111a
Merge remote-tracking branch 'upstream/dev' into mailbox
...
Conflicts:
app/views/harvests/show.html.haml
2019-08-08 11:23:41 +12:00
Brenda Wallace
e49878ff7f
Delete stale.yml
2019-08-08 11:15:36 +12:00
Brenda Wallace
523eda01a0
Merge branch 'master' into dev
2019-08-08 11:15:22 +12:00
Brenda Wallace
8641c13c06
Merge pull request #2112 from Br3nda/harvest-show
...
Tidy up display of harvests#show
2019-08-08 11:14:49 +12:00
Brenda Wallace
548bc1581a
Removing notification mailer spec
2019-08-08 10:21:39 +12:00
Brenda Wallace
4a81b18159
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-08-08 09:32:09 +12:00
Brenda Wallace
12c1002dc6
Removing unused notifications code
2019-08-08 09:31:53 +12:00
Brenda Wallace
0fa1966c68
Merge branch 'dev' into mailbox
2019-08-08 09:25:30 +12:00
dependabot-preview[bot]
6ebd22c8a3
Bump percy-capybara from 4.0.1 to 4.0.2
...
Bumps [percy-capybara](https://github.com/percy/percy-capybara ) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/percy/percy-capybara/releases )
- [Commits](https://github.com/percy/percy-capybara/compare/v4.0.1...v4.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 13:47:07 +00:00
dependabot-preview[bot]
4306ab12c7
Bump haml from 5.1.1 to 5.1.2
...
Bumps [haml](https://github.com/haml/haml ) from 5.1.1 to 5.1.2.
- [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.1.1...v5.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 13:20:56 +00:00
dependabot-preview[bot]
9a106d4ba6
Bump rubocop from 0.73.0 to 0.74.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.73.0 to 0.74.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.73.0...v0.74.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 12:48:52 +00:00
dependabot-preview[bot]
b6e5a88b32
Bump webdrivers from 4.1.1 to 4.1.2
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.1 to 4.1.2.
- [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.1...v4.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 11:49:25 +00:00
Brenda Wallace
69d3b89e87
Update install_elasticsearch.sh
2019-08-07 22:52:11 +12:00
Brenda Wallace
4d75c59301
back to elastic 6.2.3
2019-08-07 22:51:52 +12:00
Brenda Wallace
920123f58f
Merge branch 'dev' into harvest-show
2019-08-07 22:43:34 +12:00
Brenda Wallace
bccd83c706
Merge branch 'dev' into mailbox
2019-08-07 22:43:15 +12:00
dependabot-preview[bot]
329bf16872
Bump rubocop-rspec from 1.34.0 to 1.35.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.34.0 to 1.35.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.34.0...v1.35.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 10:41:54 +00:00
Brenda Wallace
21b63d9b62
lint
2019-08-07 22:36:43 +12:00
Brenda Wallace
3a87b73620
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-08-07 22:35:02 +12:00
Brenda Wallace
909d9b34ef
lint
2019-08-07 22:34:53 +12:00
Brenda Wallace
2f5f8985e7
lint
2019-08-07 22:34:41 +12:00
Brenda Wallace
2f0e387646
rubocop lint
2019-08-07 22:33:39 +12:00
Brenda Wallace
83322becb2
Use guard clause
2019-08-07 22:33:01 +12:00
codefactor-io
78852e14c9
[CodeFactor] Apply fixes
2019-08-07 10:32:24 +00:00
Brenda Wallace
d208cce57b
Merge branch 'dev' into mailbox
2019-08-07 22:32:00 +12:00
Brenda Wallace
dc59b487ca
tests for restoring conversations
2019-08-07 22:28:18 +12:00
Brenda Wallace
cafbfb349f
Delete and restore buttons
2019-08-07 22:18:24 +12:00
Brenda Wallace
8d12586aa2
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-08-07 21:49:40 +12:00
Brenda Wallace
60671af6ab
Conversations spec
2019-08-07 21:49:27 +12:00
Brenda Wallace
33c29e54be
Merge branch 'dev' into harvest-show
2019-08-07 20:00:48 +12:00
dependabot-preview[bot]
3e2d1c806b
Bump faker from 1.9.6 to 2.1.0
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.6 to 2.1.0.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/1.9.6...v2.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 07:28:54 +00:00
Daniel O'Connor
72fd579045
Merge branch 'dev' into mailbox
2019-08-07 16:41:57 +09:30
Daniel O'Connor
cf03cf4ad9
Merge branch 'dev' into harvest-show
2019-08-07 16:33:40 +09:30
dependabot-preview[bot]
3345cd200c
Bump capybara from 3.26.0 to 3.28.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.26.0 to 3.28.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.26.0...3.28.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 06:57:08 +00:00
Brenda Wallace
9651bc6db5
Changed notifications spec to conversations spec
2019-08-07 16:51:46 +12:00
Brenda Wallace
ba1c3a7159
add the notifications helper back
2019-08-07 16:20:10 +12:00
Brenda Wallace
149f92536d
conversations view matching the index (avatar photos on the right)
2019-08-07 16:19:43 +12:00
Brenda Wallace
4c045374ff
tidy up plantings view
2019-08-07 16:19:37 +12:00
Brenda Wallace
6af95fa722
Help percy find the correct link
2019-08-07 16:19:11 +12:00
Brenda Wallace
0c8e993006
gardens show all as a button
2019-08-07 16:18:59 +12:00
dependabot-preview[bot]
d6d5e95050
Bump searchkick from 4.0.2 to 4.1.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.0.2 to 4.1.0.
- [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.2...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-06 00:24:06 +00:00
dependabot-preview[bot]
e34883d32d
Bump oj from 3.8.0 to 3.8.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.8.0 to 3.8.1.
- [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.8.0...v3.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-05 22:41:29 +00:00
Brenda Wallace
5d8a952441
Merge pull request #2119 from Br3nda/fix-travis
...
fixing travis build
2019-08-06 07:23:24 +10:00
Brenda Wallace
493a49bb3e
Nicer display when there are not gardens
2019-08-05 18:57:54 +12:00
Brenda Wallace
17da3bdd96
conversations view changes
2019-08-04 17:41:43 +12:00
Brenda Wallace
71c4154563
Merge remote-tracking branch 'origin/dev' into mailbox
2019-08-04 16:35:57 +12:00
Brenda Wallace
0dc1720711
Double quote to prevent globbing and word splitting.
2019-08-04 16:24:09 +12:00
Brenda Wallace
080e0dbc78
give the caller clues if they don't set a version
2019-08-04 16:21:31 +12:00
Brenda Wallace
00fbfc77e7
tidy up inbox view
2019-08-04 16:04:23 +12:00
Brenda Wallace
5157793202
wrap long line
2019-08-04 15:37:15 +12:00
Brenda Wallace
8d745ed322
Fix bundler cache
2019-08-04 13:44:52 +12:00
Brenda Wallace
9fbd4e4110
Tell travis to use trusty
2019-08-04 11:30:11 +12:00
Brenda Wallace
19ebb5941e
Added comment about postgresql version matchin
2019-08-03 11:49:22 +12:00
Brenda Wallace
086ba0610a
Install postgresql from APT
2019-08-03 11:45:38 +12:00
Brenda Wallace
32a9482d12
Remove sprockets cache
2019-08-03 11:39:08 +12:00
Brenda Wallace
953af21e3e
prefix namespace into ELASTIC_SEARCH_VERSION for travis-ci
2019-08-03 11:23:45 +12:00
Brenda Wallace
2c69b5a99c
Echo the elastic search version
2019-07-29 16:24:50 +12:00
Brenda Wallace
8975e52521
Merge remote-tracking branch 'origin/harvest-show' into harvest-show
2019-07-29 16:20:35 +12:00
Brenda Wallace
4605d6c107
Upgrade to an elastic search version that matches production
2019-07-29 16:19:03 +12:00
Brenda Wallace
abdfbdd3b1
Merge branch 'dev' into harvest-show
2019-07-29 10:25:33 +12:00
Brenda Wallace
4859116577
Tidy up display of harvests#show
2019-07-29 10:15:06 +12:00
Brenda Wallace
bf77f31777
don't show progress bars on annuals
2019-07-28 14:28:08 +12:00
dependabot-preview[bot]
c198b7f446
Bump rubocop-rspec from 1.33.0 to 1.34.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.33.0 to 1.34.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.33.0...v1.34.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-24 09:31:14 +00:00
dependabot-preview[bot]
724cac959b
Bump rake from 12.3.2 to 12.3.3
...
Bumps [rake](https://github.com/ruby/rake ) from 12.3.2 to 12.3.3.
- [Release notes](https://github.com/ruby/rake/releases )
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc )
- [Commits](https://github.com/ruby/rake/compare/v12.3.2...v12.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-23 02:07:54 +00:00
Brenda Wallace
17e3998261
Move from tables to lists
2019-07-23 11:27:53 +12:00
Brenda Wallace
4a8f737bac
Revert "Removed chekcing subject in converation"
...
This reverts commit 6622319466 .
2019-07-23 09:50:37 +12:00
Brenda Wallace
6622319466
Removed chekcing subject in converation
2019-07-23 09:47:16 +12:00
Brenda Wallace
55e0a10dc8
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-07-23 09:45:22 +12:00
Brenda Wallace
8cb21ec79b
Removing notifications specs
2019-07-23 09:41:54 +12:00
Brenda Wallace
8ca0eef53c
Removing notifications controller specs
2019-07-23 09:41:18 +12:00
Brenda Wallace
fab222f581
Removing rubocop.yml
2019-07-23 09:38:59 +12:00
Brenda Wallace
01cb0ca975
Removed todo
2019-07-23 09:38:30 +12:00
Brenda Wallace
e24c0ee3e8
Removing commented out code
2019-07-23 09:38:22 +12:00
Brenda Wallace
01b53a0e69
continuing to replace notifications with conversations
2019-07-23 09:37:57 +12:00
Brenda Wallace
57ca80f0eb
line up display of posts
2019-07-21 20:26:04 +12:00
Brenda Wallace
50560b01eb
line up boxes
2019-07-21 20:24:56 +12:00
Brenda Wallace
783e4ae046
fixed up comments by deleted members
2019-07-21 20:24:39 +12:00
Brenda Wallace
e90d719436
fixed unread count on headers
2019-07-21 20:24:30 +12:00
Brenda Wallace
3db63aeabf
untrash a message
2019-07-21 20:05:06 +12:00
Brenda Wallace
bcbb020fde
newline at end of file
2019-07-21 19:27:53 +12:00
Brenda Wallace
a9b8003ff3
DRY
2019-07-21 19:23:33 +12:00
Brenda Wallace
6b501f13ee
Fixed double negative
2019-07-21 19:22:25 +12:00
Brenda Wallace
0ac243e129
Remove unused methods
2019-07-21 19:21:55 +12:00
Brenda Wallace
6f2e27952c
Remove unused methods
2019-07-21 19:21:34 +12:00
Brenda Wallace
2b9538c407
Use a guard clause
2019-07-21 19:21:13 +12:00
Brenda Wallace
733a8642dd
rubocop lint
2019-07-21 19:19:14 +12:00
Brenda Wallace
965c9af15a
Sort scss lines
2019-07-21 19:18:13 +12:00
Brenda Wallace
3f84f5abe1
harvest owner info
2019-07-21 19:16:22 +12:00
Brenda Wallace
e309548d20
mark required fields on a message
2019-07-21 19:16:07 +12:00
Brenda Wallace
6485bde8e7
show harvest owner
2019-07-21 19:15:45 +12:00
Brenda Wallace
36c4c1e971
use message path instead of notifications
2019-07-21 19:14:22 +12:00
Brenda Wallace
bcd95aab4a
removed unused partial
2019-07-21 19:14:02 +12:00
Brenda Wallace
754da0777a
preserve which box we're looking at while deleting messages
2019-07-21 19:13:51 +12:00
Brenda Wallace
d382f84f9b
Remove notifications code
2019-07-21 17:28:04 +12:00
Brenda Wallace
6144a7c065
tidy display of discard member on admin page
2019-07-21 17:26:45 +12:00
Brenda Wallace
eda3639708
Discard members on ban
2019-07-21 17:23:28 +12:00
Brenda Wallace
c4806fddf3
re-coloured the memberships to green
2019-07-21 17:21:36 +12:00
Brenda Wallace
39dc878ea7
Tidy up styling of conversations#index
2019-07-21 17:15:21 +12:00
Brenda Wallace
f9f1846bce
Using chip on plantings cards
...
(made room by shrinking the date)
2019-07-21 16:59:59 +12:00
Brenda Wallace
e77e806efc
turn members/tiny into a "chip"
2019-07-21 16:59:26 +12:00
Brenda Wallace
67ce5265b4
Migrate from paranoia to discard
...
closes #1995
2019-07-21 16:59:06 +12:00
Brenda Wallace
7f16fdfe53
working on display of messages in conversations
2019-07-21 15:29:54 +12:00
Brenda Wallace
1df84beb6d
introduce pretty chips for members
2019-07-21 15:29:39 +12:00
Brenda Wallace
dab9a96486
better handling of deleted members
2019-07-21 14:47:32 +12:00
Brenda Wallace
ecb8ad9dfd
removing unused code
2019-07-21 14:24:02 +12:00
Brenda Wallace
1e7eb7326f
rubocop linter
2019-07-21 14:23:02 +12:00
Brenda Wallace
48117eab43
Merge branch 'mailbox' of github.com:br3nda/growstuff into mailbox
2019-07-21 11:25:46 +12:00
Brenda Wallace
a4e0ed0d8d
Fixed deleted imports
2019-07-21 11:25:37 +12:00
Brenda Wallace
53358e9769
Merge branch 'dev' into mailbox
2019-07-21 10:14:36 +12:00
Brenda Wallace
7d9cbe9bf7
Merge branch 'dev' into UTFGardenNames
2019-07-21 10:14:03 +12:00
Brenda Wallace
93a171b1b2
Create stale.yml
2019-07-21 10:13:30 +12:00
Brenda Wallace
1199df6d9d
Merge branch 'dev' into mailbox
2019-07-20 19:44:12 +12:00
Brenda Wallace
d91a5bf55f
Rewriting messages functionality to use mail boxer
2019-07-20 19:43:29 +12:00
Brenda Wallace
66f1133e9b
Merge pull request #2090 from Growstuff/dev
...
Release 58
2019-07-20 14:02:51 +12:00
Brenda Wallace
e25e03a2e9
Merge pull request #2097 from Br3nda/fix/notifications
...
Fix display of messages from deleted members
2019-07-20 13:22:54 +12:00
Brenda Wallace
b3cc365941
Merge pull request #2095 from Br3nda/ban-hammer
...
Ban hammer
2019-07-20 13:22:36 +12:00
Brenda Wallace
49b6261f87
Merge branch 'dev' into fix/notifications
2019-07-20 13:22:21 +12:00
Brenda Wallace
26839acf01
Turn off message sending until errors are fixed
2019-07-20 13:21:26 +12:00
Brenda Wallace
339b3fd57e
Moving to conversations and messages instead of notifications
2019-07-20 13:21:05 +12:00
Brenda Wallace
097555ec06
View for messages
2019-07-20 13:20:24 +12:00
Brenda Wallace
629352ef4f
Merge remote-tracking branch 'upstream/dev' into mailbox
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/application.scss
db/schema.rb
2019-07-20 13:20:10 +12:00
dependabot-preview[bot]
f0ec158053
Bump webdrivers from 4.1.0 to 4.1.1
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.0 to 4.1.1.
- [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.0...v4.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-19 20:25:54 +00:00
dependabot-preview[bot]
e4512beb03
Bump oj from 3.7.12 to 3.8.0
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.12 to 3.8.0.
- [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.7.12...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-19 00:37:34 +00:00
Brenda Wallace
314d95869a
Merge branch 'dev' into fix/notifications
2019-07-18 12:57:36 +12:00
dependabot-preview[bot]
64fa4584b9
Bump rubocop from 0.72.0 to 0.73.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.72.0 to 0.73.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.72.0...v0.73.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-17 21:23:37 +00:00
dependabot-preview[bot]
b7175a2e32
[Security] Bump mini_magick from 4.9.3 to 4.9.4
...
Bumps [mini_magick](https://github.com/minimagick/minimagick ) from 4.9.3 to 4.9.4. **This update includes security fixes.**
- [Release notes](https://github.com/minimagick/minimagick/releases )
- [Commits](https://github.com/minimagick/minimagick/compare/v4.9.3...v4.9.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-17 20:28:03 +00:00
Brenda Wallace
40b6ba6b1a
Merge branch 'dev' into ban-hammer
2019-07-17 16:47:05 +12:00
Brenda Wallace
7f45b194e9
Update app/views/notifications/show.html.haml
2019-07-17 11:47:24 +12:00
Brenda Wallace
a3b287fa3b
Merge branch 'fix/notifications' of github.com:br3nda/growstuff into fix/notifications
2019-07-17 10:38:23 +12:00
Brenda Wallace
608cad2615
Fix variable name
2019-07-17 10:22:35 +12:00
Brenda Wallace
fb7d8aa9c2
Merge branch 'dev' into fix/notifications
2019-07-17 09:30:28 +12:00
dependabot-preview[bot]
f46cc31515
Bump capybara from 3.25.0 to 3.26.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.25.0 to 3.26.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.25.0...3.26.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-16 21:25:13 +00:00
Brenda Wallace
ac6ef384e0
Merge branch 'master' into fix/notifications
...
Conflicts:
app/views/notifications/index.html.haml
2019-07-17 09:24:04 +12:00
Brenda Wallace
c8a721c304
Fixes error displaying messages from deleted members
2019-07-17 09:22:25 +12:00
Brenda Wallace
e0dcd0226e
Handle messages from deleted members
2019-07-17 09:09:16 +12:00
Brenda Wallace
42269e3261
Comment out member avatar until we work out why it's breaking
2019-07-17 08:56:29 +12:00
Brenda Wallace
4ce2eca670
Comment out member avatar until we work out why it's breaking
2019-07-17 08:37:54 +12:00
Brenda Wallace
6ffc61aace
Merge branch 'ban-hammer' of github.com:br3nda/growstuff into ban-hammer
2019-07-16 23:11:44 +12:00
Brenda Wallace
312cd0d770
Read posts from member.posts
2019-07-16 23:10:01 +12:00
Brenda Wallace
560936eb13
Merge branch 'dev' into ban-hammer
2019-07-16 23:05:28 +12:00
dependabot-preview[bot]
2dfef909bd
Bump chartkick from 3.2.0 to 3.2.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.2.0 to 3.2.1.
- [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.2.0...v3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-16 10:53:06 +00:00
Brenda Wallace
91897273be
Merge branch 'dev' into ban-hammer
2019-07-16 20:56:59 +12:00
Brenda Wallace
fb77beeb7d
rubocop lint
2019-07-16 20:56:33 +12:00
Brenda Wallace
bf77d4b913
removed test for @posts variables on members controller
...
because that variable isn't used so it doesn't exist anymore
2019-07-16 20:55:09 +12:00
Brenda Wallace
c8e47e800e
Moved admin ban code to admin controler
2019-07-16 20:54:32 +12:00
Brenda Wallace
b2537638ed
Move member banning to admin/members controller
2019-07-16 18:56:49 +12:00
Brenda Wallace
006c7f02f5
feature specs for banning a member
2019-07-16 18:31:53 +12:00
Brenda Wallace
8827fb1291
go to admin_members_path after banning a member
2019-07-16 18:31:43 +12:00
Brenda Wallace
29823fd953
Make the follow button stand out
2019-07-16 18:18:14 +12:00
Brenda Wallace
72d5d2e81a
Match role names to names in the seeds
2019-07-16 18:18:03 +12:00
Brenda Wallace
0622823816
Remove unused db lookup
2019-07-16 18:17:37 +12:00
Brenda Wallace
075b9b3327
Add a ban button to members
2019-07-16 18:15:54 +12:00
Brenda Wallace
c3ee80f24b
Merge pull request #2085 from Br3nda/renamed-photographings-associations
...
Renamed photographings to photo associations
2019-07-16 17:55:33 +12:00
Daniel O'Connor
b82c0ab9f1
Merge branch 'dev' into renamed-photographings-associations
2019-07-16 12:45:25 +09:30
Brenda Wallace
2162c11280
Couple breadcrumbs tidied
2019-07-16 03:15:04 +00:00
Brenda Wallace
548bbf5e57
Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations
...
Conflicts:
db/schema.rb
2019-07-16 12:12:16 +12:00
Brenda Wallace
3cd67bcc9f
Fix liked photo spec
2019-07-15 11:58:46 +00:00
Brenda Wallace
efe14d43cb
read photo from a harvest's planting
2019-07-15 11:58:46 +00:00
Brenda Wallace
99c119c07f
fixed looking up photo counts in spec
2019-07-15 11:58:46 +00:00
Brenda Wallace
60a510e73f
tests the default photo changes when someone likes a photo
2019-07-15 11:58:46 +00:00
Brenda Wallace
b1ebf67960
added more possible photo associations in photo model spec
2019-07-15 11:58:46 +00:00
Brenda Wallace
32695e3241
photos behave like likeable
2019-07-15 11:58:46 +00:00
Brenda Wallace
2879979db4
tests that likes are deleted when their photo is deleted
2019-07-15 11:58:46 +00:00
Brenda Wallace
b654fd483b
counter cache was on the wrong side of the relationship
2019-07-15 11:58:46 +00:00
Brenda Wallace
d8df4338a7
DRY garden model - get default photo from photo_capable concern
2019-07-15 11:58:46 +00:00
Brenda Wallace
e5e54d651b
Remove duplicate and unused photo methods
2019-07-15 11:58:46 +00:00
Brenda Wallace
acf58fc5e2
Choose crop photos by most liked
2019-07-15 11:58:46 +00:00
Brenda Wallace
9413d86b05
fixes percy error, running same snapshot more than once
2019-07-15 11:58:46 +00:00
Brenda Wallace
d4cfcb37ba
more percy specs
2019-07-15 11:58:46 +00:00
Brenda Wallace
5348cb6fb5
Merge branch 'master' into dev
2019-07-15 23:56:25 +12:00
dependabot-preview[bot]
485b637e04
Bump rubocop-rails from 2.2.0 to 2.2.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.2.0...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-15 09:04:21 +00:00
Brenda Wallace
1947b01c40
Merge pull request #2076 from Growstuff/dev
...
Release 57
2019-07-14 17:53:42 +12:00
Brenda Wallace
e0e10c29dc
Renaming photographings to photo associations
...
now it matches the name of its controller, and it is clearer to understand
2019-07-13 16:13:37 +12:00
dependabot-preview[bot]
117d066917
Bump puma from 4.0.0 to 4.0.1
...
Bumps [puma](https://github.com/puma/puma ) from 4.0.0 to 4.0.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.0.0...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-12 14:52:22 +00:00
dependabot-preview[bot]
3a746e7755
Bump font-awesome-sass from 5.8.1 to 5.9.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.8.1 to 5.9.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.8.1...5.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-12 11:31:08 +00:00
Brenda Wallace
a4fd0bd011
Merge pull request #2075 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.10
...
Bump jsonapi-resources from 0.9.9 to 0.9.10
2019-07-12 12:27:19 +12:00
Brenda Wallace
004319b97c
Merge pull request #2049 from Br3nda/likeable-photos
...
likes for photos
2019-07-12 12:26:05 +12:00
Brenda Wallace
6816fb9072
Added missing semicolon in scss
2019-07-12 12:02:26 +12:00
Brenda Wallace
1b87026df4
Use camel case in js
2019-07-12 11:59:48 +12:00
Brenda Wallace
80ee3eb8f1
Newline at end of file
2019-07-12 11:59:24 +12:00
Brenda Wallace
013860ba5a
specs for liking photos from crops#show and photos#index
2019-07-12 11:57:21 +12:00
Brenda Wallace
c9f9315d8d
specs for liking photos from photos#show
2019-07-12 11:29:47 +12:00
Brenda Wallace
a7acaea03d
Update posts liking spec to find where the count moved to
2019-07-12 10:47:48 +12:00
Brenda Wallace
76260fec1d
Merge branch 'dev' into likeable-photos
2019-07-12 10:20:05 +12:00
Brenda Wallace
9686305857
The like icons are now the buttons
2019-07-12 10:13:24 +12:00
Brenda Wallace
a87248a43e
DRY up detecting if photo/post already liked
2019-07-12 09:42:45 +12:00
Brenda Wallace
b36e80bbad
Use our own class to indicate liked
2019-07-12 09:37:44 +12:00
Brenda Wallace
2b1895968b
reverting a line
...
aparently this link works out if you've already like it
2019-07-12 09:32:03 +12:00
Brenda Wallace
af0d84d9f1
Updating likes js code
2019-07-12 09:28:45 +12:00
Brenda Wallace
7d1f9c5a3a
Most post like into a wrapper in the html
2019-07-12 08:47:22 +12:00
Brenda Wallace
addb9a48cf
Fix growstuff markdown specs to expect path only links
2019-07-11 15:12:16 +00:00
Brenda Wallace
408e8388f2
Use relative paths for markdown crop links
2019-07-11 15:12:16 +00:00
Brenda Wallace
7b6dc1943a
Fixes staging linking to production
2019-07-11 15:12:16 +00:00
Brenda Wallace
3d92cd1d1d
fixes percy error, running same snapshot more than once
2019-07-11 15:12:16 +00:00
Brenda Wallace
ae1e48129c
more percy specs
2019-07-11 15:12:16 +00:00
Brenda Wallace
80429f935a
Merge branch 'dev' into likeable-photos
2019-07-11 22:42:22 +12:00
dependabot-preview[bot]
40e9662234
Bump jsonapi-resources from 0.9.9 to 0.9.10
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.9 to 0.9.10.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.9...v0.9.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-11 10:29:45 +00:00
Brenda Wallace
c50556221c
TRying to get mailboxxer working
2019-07-11 22:28:51 +12:00
Brenda Wallace
26bb9a4c22
Merge branch 'master' into dev
2019-07-11 22:27:51 +12:00
Brenda Wallace
738644ffbc
Remove unnecesary theme param from pagination
2019-07-11 10:18:54 +00:00
Brenda Wallace
5c1dd2ac6b
Update inbox link in spec
2019-07-11 10:18:54 +00:00
Brenda Wallace
93e7703a6a
Add missing translation
2019-07-11 10:18:54 +00:00
Brenda Wallace
01e8cafb9f
Update inbox link in spec
2019-07-11 10:18:54 +00:00
Brenda Wallace
2a390f9c24
Fix sorting
2019-07-11 10:18:54 +00:00
Brenda Wallace
347417b7ed
Put newest messages at the top of the page
2019-07-11 10:18:54 +00:00
Brenda Wallace
88da4a724d
Add the unread inbox menu display to percy
2019-07-11 10:18:54 +00:00
Brenda Wallace
5c69dc0528
use badges for unread message count
2019-07-11 10:18:54 +00:00
Brenda Wallace
edf4985da0
adding breadcrumbs
2019-07-11 10:18:54 +00:00
Brenda Wallace
b064d8db96
tidy up larger screen display of inbox
2019-07-11 10:18:54 +00:00
Brenda Wallace
13813c4693
Fix spec for notifications#index
2019-07-11 10:18:54 +00:00
Brenda Wallace
8b47e277ec
fixes percy error, running same snapshot more than once
2019-07-11 10:18:54 +00:00
Brenda Wallace
5233df666d
update notification view spec, not a table anymore
2019-07-11 10:18:54 +00:00
Brenda Wallace
6383dbc19f
more percy specs
2019-07-11 10:18:54 +00:00
Brenda Wallace
a7837f0d8f
Update notification spec to count messages, not rows
2019-07-11 10:18:54 +00:00
Brenda Wallace
dde6668293
Notifications responsiveness
2019-07-11 10:18:54 +00:00
Brenda Wallace
7ec572b107
Merge branch 'inbox' into mailbox
2019-07-11 22:07:26 +12:00
Brenda Wallace
d2b310b9eb
Remove unnecesary theme param from pagination
2019-07-11 22:06:55 +12:00
Brenda Wallace
fa39a23b01
Merge branch 'inbox' into mailbox
2019-07-11 22:04:13 +12:00
Brenda Wallace
c91fdf4744
Update inbox link in spec
2019-07-11 22:01:03 +12:00
Brenda Wallace
063c745aca
Add missing translation
2019-07-11 20:13:10 +12:00
Brenda Wallace
3f8ddc24f0
Merge branch 'inbox' of github.com:br3nda/growstuff into inbox
2019-07-11 20:12:04 +12:00
Brenda Wallace
d2c5d8e9ce
Update inbox link in spec
2019-07-11 20:11:49 +12:00
Brenda Wallace
e97608b5ff
Update inbox link in spec
2019-07-11 20:11:28 +12:00
Daniel O'Connor
1c96007f1c
Merge branch 'dev' into inbox
2019-07-11 17:33:21 +09:30
Brenda Wallace
cafad7a009
Fix sorting
2019-07-11 19:53:45 +12:00
Brenda Wallace
b1440041cd
Remove duplicate and empty css definitions
2019-07-11 06:18:16 +00:00
Brenda Wallace
430a29865d
Remove badge override
2019-07-11 06:18:16 +00:00
Brenda Wallace
e355c83c15
Put newest messages at the top of the page
2019-07-11 17:26:40 +12:00
Brenda Wallace
cac685ba7e
Merge pull request #2048 from Growstuff/dev
...
Release 56
2019-07-11 17:06:34 +12:00
Brenda Wallace
6a3aae2902
Merge pull request #2074 from Growstuff/dependabot/npm_and_yarn/lodash-4.17.14
...
[Security] Bump lodash from 4.17.11 to 4.17.14
2019-07-11 16:54:57 +12:00
dependabot-preview[bot]
cf3f5bf5a6
[Security] Bump lodash from 4.17.11 to 4.17.14
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-11 04:32:32 +00:00
dependabot-preview[bot]
6a0fc51ae5
[Security] Bump lodash.template from 4.4.0 to 4.5.0
...
Bumps [lodash.template](https://github.com/lodash/lodash ) from 4.4.0 to 4.5.0. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.4.0...4.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-11 04:25:20 +00:00
Brenda Wallace
da8d67c7e7
Add the unread inbox menu display to percy
2019-07-11 13:20:40 +12:00
Brenda Wallace
29e606a870
use badges for unread message count
2019-07-11 13:17:31 +12:00
Brenda Wallace
49c02dfaab
Merge branch 'badges' into inbox
2019-07-11 13:16:28 +12:00
Brenda Wallace
97ffc0d1bf
adding breadcrumbs
2019-07-11 13:13:17 +12:00
Brenda Wallace
4d1b45317b
tidy up larger screen display of inbox
2019-07-11 13:06:02 +12:00
Brenda Wallace
1250fa388f
Fix spec for notifications#index
2019-07-11 12:41:02 +12:00
Brenda Wallace
aee21344f5
Merge branch 'dev' into inbox
2019-07-11 12:15:39 +12:00
Brenda Wallace
2cc307f09b
fixes percy error, running same snapshot more than once
2019-07-11 12:14:54 +12:00
Brenda Wallace
de80a84502
update notification view spec, not a table anymore
2019-07-11 12:12:05 +12:00
Brenda Wallace
67af069804
more percy specs
2019-07-11 12:08:15 +12:00
Brenda Wallace
f444196b5c
Update notification spec to count messages, not rows
2019-07-11 11:48:10 +12:00
Brenda Wallace
a6e9ef2d92
Notifications responsiveness
2019-07-11 11:33:46 +12:00
Brenda Wallace
edfef7f513
Merge remote-tracking branch 'upstream/dev' into badges
2019-07-11 08:49:41 +12:00
Brenda Wallace
170c7d99ac
Merge branch 'dev' into likeable-photos
2019-07-11 08:42:07 +12:00
Brenda Wallace
98f190a53f
Removed mention of jasmine
...
They aren't used anymore.
2019-07-10 20:23:15 +00:00
Brenda Wallace
4e6debcb55
Https in url to gardenate
2019-07-10 09:03:05 +00:00
Brenda Wallace
c447ea03f7
Remove spec looking for old wrangle guidelines
2019-07-10 09:03:05 +00:00
Brenda Wallace
104e838448
Https in specs
2019-07-10 09:03:05 +00:00
Brenda Wallace
3e4a9f0292
Ebay link using https
2019-07-10 09:03:05 +00:00
Brenda Wallace
b1b459f9d8
link to markdown docs using https
2019-07-10 09:03:05 +00:00
Brenda Wallace
bd938c777d
Link to open streetmap using https
2019-07-10 09:03:05 +00:00
Brenda Wallace
37e6ed1b08
Link to ogp.me using https
2019-07-10 09:03:05 +00:00
Brenda Wallace
8f55a75123
Link to facebook, twitter and flickr with https
2019-07-10 09:03:05 +00:00
Brenda Wallace
6ce28a87aa
Remove outdated links from wrangle guidelines
2019-07-10 09:03:05 +00:00
Brenda Wallace
bd7a201e55
Link to gardenate with https
2019-07-10 09:03:05 +00:00
Brenda Wallace
80a551ca43
Link to google with https
2019-07-10 09:03:05 +00:00
Brenda Wallace
6b02bb9cc6
remove IE9 shim
2019-07-10 09:03:05 +00:00
Brenda Wallace
4e67a11841
use https links to facebook, twitter, and flickr
2019-07-10 09:03:05 +00:00
Brenda Wallace
f8c643d13a
Updating links to use https to mapbox
2019-07-10 09:03:05 +00:00
Brenda Wallace
3a4c429275
Adding wikihow instructions link
2019-07-10 08:45:50 +00:00
Brenda Wallace
d661d8579f
Merge branch 'dev' into likeable-photos
2019-07-10 14:54:17 +12:00
Brenda Wallace
ac3679fa18
Remove duplicate and empty css definitions
2019-07-10 11:37:41 +12:00
Brenda Wallace
0a07442317
Remove badge override
2019-07-10 11:36:03 +12:00
Brenda Wallace
97246b8632
Merge pull request #2066 from Growstuff/imgbot
...
[ImgBot] Optimize images
2019-07-09 23:59:25 +12:00
ImgBotApp
cf787cd278
[ImgBot] Optimize images
...
/app/assets/images/open_service.png -- 1.08kb -> 0.40kb (63.12%)
2019-07-09 10:38:04 +00:00
Brenda Wallace
69c9754664
Merge pull request #2064 from Br3nda/fix-1989
...
Fix 1989
2019-07-09 22:21:55 +12:00
Brenda Wallace
b1c6560a8f
Merge branch 'dev' into fix-1989
2019-07-09 22:10:30 +12:00
Brenda Wallace
04b4354bda
Merge branch 'dev' into likeable-photos
2019-07-09 14:23:50 +12:00
Brenda Wallace
87558982b1
Merge branch 'map-fix' into dev
2019-07-09 14:15:04 +12:00
Brenda Wallace
fb4ed1f637
Merge branch 'fix/2011' into dev
2019-07-09 14:14:42 +12:00
Brenda Wallace
35fe92a7db
Merge branch 'fix-inbox-menu' into dev
2019-07-09 14:14:31 +12:00
Brenda Wallace
3e89ca95ed
Merge branch 'dev' into fix-1989
2019-07-09 13:18:02 +12:00
Brenda Wallace
38ebbd0adb
Make headers consistent
...
fixes #2011
2019-07-09 01:00:19 +00:00
Brenda Wallace
7b87f8e4db
Add flash messages to controllers
2019-07-09 09:19:27 +12:00
Brenda Wallace
68bc237dd9
Wrap for readbility
2019-07-09 09:12:52 +12:00
Brenda Wallace
f127dd18ba
fix display of inbox item in menu
...
fixes #2046
2019-07-09 09:11:49 +12:00
Brenda Wallace
fa8cc5a499
Expect https in footer spec
2019-07-09 08:04:32 +12:00
Brenda Wallace
827e871a22
Merge branch 'dev' into fix-1989
2019-07-09 01:12:47 +12:00
Brenda Wallace
465a07c377
Merge pull request #2038 from Br3nda/following-page
...
Show activity from people i follow
2019-07-09 01:11:38 +12:00
Brenda Wallace
ec974cdfee
Merge branch 'dev' into following-page
2019-07-09 00:31:32 +12:00
Brenda Wallace
833f46eea8
Merge branch 'dev' into fix-1989
2019-07-09 00:30:12 +12:00
Brenda Wallace
9033d432f7
Merge branch 'dev' into likeable-photos
2019-07-09 00:29:50 +12:00
Brenda Wallace
4f0fca3634
Merge pull request #2054 from Br3nda/tidy-member-edit
...
Tidy up member edit
2019-07-09 00:29:31 +12:00
Brenda Wallace
7749b2daaf
Merge branch 'dev' into fix-1989
2019-07-09 00:29:07 +12:00
Brenda Wallace
4ea9e17e09
Merge branch 'dev' into tidy-member-edit
2019-07-08 23:32:18 +12:00
Brenda Wallace
43ba345f4d
Update app/views/devise/registrations/_edit_apps.html.haml
...
Co-Authored-By: pozorvlak <miles@assyrian.org.uk >
2019-07-08 23:32:02 +12:00
dependabot-preview[bot]
17708a8122
Bump faker from 1.9.5 to 1.9.6
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.5 to 1.9.6.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v.1.9.5...1.9.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-08 10:57:02 +00:00
Brenda Wallace
9f9bf5012a
Make headers consistent
...
fixes #2011
2019-07-08 22:27:33 +12:00
Brenda Wallace
46a7e3fb42
Merge branch 'dev' into fix-1989
2019-07-08 22:21:54 +12:00
Brenda Wallace
bd9a6f7620
Merge branch 'dev' into likeable-photos
2019-07-08 22:20:41 +12:00
Brenda Wallace
4f43f2e998
Merge branch 'dev' into following-page
2019-07-08 22:20:26 +12:00
Brenda Wallace
d23a94c691
Move open service badge into asset pipeline
2019-07-08 22:19:16 +12:00
dependabot-preview[bot]
036010bb39
Bump coveralls from 0.7.1 to 0.8.19
...
Bumps [coveralls](https://coveralls.io ) from 0.7.1 to 0.8.19.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-08 10:16:42 +00:00
Brenda Wallace
80a1066efe
Added alt tag
2019-07-08 22:15:53 +12:00
Brenda Wallace
bdbb44e4a3
fix mix content warnings
...
closes #2043
2019-07-08 22:14:58 +12:00
Brenda Wallace
2c7183c097
Merge branch 'dev' into likeable-photos
2019-07-08 22:04:02 +12:00
Brenda Wallace
6ad694cf30
Tidy up member edit
2019-07-08 21:56:37 +12:00
dependabot-preview[bot]
d09ac4b6d7
Bump rubocop-rails from 2.1.0 to 2.2.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.1.0...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-08 09:38:32 +00:00
Brenda Wallace
def17e020e
New line at end of file
2019-07-08 21:28:39 +12:00
Brenda Wallace
05ed9de8b6
Add leaflet initializer
2019-07-08 20:51:14 +12:00
codefactor-io
5d07a30d17
[CodeFactor] Apply fixes
2019-07-08 08:16:24 +00:00
Brenda Wallace
dd6446b195
fix icon method name
2019-07-08 20:13:21 +12:00
Brenda Wallace
e40a2c3176
remove debugger
2019-07-08 20:12:42 +12:00
Brenda Wallace
cfab855a0f
revert adding id
2019-07-08 20:06:48 +12:00
Brenda Wallace
f1df90f189
Remove debugger
2019-07-08 20:05:48 +12:00
Brenda Wallace
bff31ddb5c
Removed extra blank lines
2019-07-08 20:04:27 +12:00
Brenda Wallace
6fc9a858a9
Merge branch 'dev' into likeable-photos
2019-07-08 20:03:41 +12:00
Brenda Wallace
f638d0c2d3
rubocop lint
2019-07-08 20:03:27 +12:00
Brenda Wallace
61047df429
Merge branch 'dev' into following-page
2019-07-08 20:02:47 +12:00
Brenda Wallace
3b9aee3f67
Merge pull request #2041 from Br3nda/post-photos
...
Adding photos directly to a post
2019-07-08 20:02:29 +12:00
Brenda Wallace
a66add6568
Merge branch 'dev' into likeable-photos
2019-07-08 20:02:09 +12:00
Brenda Wallace
cbed8cc259
likes for photos
2019-07-08 20:00:55 +12:00
Brenda Wallace
8baf8757ca
Merge branch 'dev' into following-page
2019-07-08 17:07:55 +12:00
Brenda Wallace
4845211429
Merge branch 'dev' into post-photos
2019-07-08 17:07:45 +12:00
Brenda Wallace
72cf7365a2
Merge branch 'master' into dev
2019-07-08 17:07:19 +12:00
Brenda Wallace
bda0712234
Merge pull request #2047 from Growstuff/imgbot
...
[ImgBot] Optimize images
2019-07-08 17:06:42 +12:00
Brenda Wallace
680111add7
Merge branch 'dev' into post-photos
2019-07-08 17:06:04 +12:00
Brenda Wallace
253c0cb939
Merge branch 'dev' into following-page
2019-07-08 16:44:03 +12:00
ImgBotApp
770c6f45fd
[ImgBot] Optimize images
...
/app/assets/images/placeholder_600.png -- 31.66kb -> 29.12kb (8.03%)
2019-07-08 04:43:51 +00:00
Brenda Wallace
e7cfe0b5c4
Update spec to look for placeholder_600
2019-07-08 04:43:03 +00:00
Brenda Wallace
6d7b990797
Remove unused rails.png
2019-07-08 04:43:03 +00:00
Brenda Wallace
f7af2bf816
Higher res photo placeholder
2019-07-08 04:43:03 +00:00
Daniel O'Connor
cf0d648b31
Merge branch 'dev' into post-photos
2019-07-08 13:45:26 +09:30
Daniel O'Connor
76c18014e2
Merge pull request #2042 from Br3nda/active-gardens
...
only show active gardens on planting form
2019-07-08 13:40:08 +09:30
Brenda Wallace
0a030c56bb
files should end with a new line
2019-07-08 04:08:58 +00:00
Brenda Wallace
bbd43f57bc
Prevent post images going off screen
2019-07-08 04:08:58 +00:00
Brenda Wallace
9c25fd043f
only show active gardens on planting form
2019-07-08 13:24:27 +12:00
Brenda Wallace
5cef4d728c
Adding photos directly to a post
2019-07-08 13:20:57 +12:00
Brenda Wallace
4acf165f24
specs for event_helper
2019-07-08 12:44:26 +12:00
Brenda Wallace
acad29dab0
Feature spec for timeline/activity page
2019-07-08 12:26:11 +12:00
Brenda Wallace
1427441163
No link to the planting with no date
2019-07-08 11:49:13 +12:00
Brenda Wallace
7054787870
fix up members#show spec
2019-07-08 11:04:23 +12:00
Brenda Wallace
029beab1dd
timeline service specs
2019-07-08 10:39:46 +12:00
Brenda Wallace
3d9791cb96
update spec, now that resolve_model has moved
2019-07-08 10:10:01 +12:00
Brenda Wallace
e080407deb
update spec to not have links to plantings with not dates
2019-07-08 10:08:26 +12:00
Brenda Wallace
5c6e65cd01
remove quotes in haml
2019-07-08 10:05:53 +12:00
Brenda Wallace
013b388beb
remove quotes in haml
2019-07-08 10:05:36 +12:00
Brenda Wallace
07945e9f69
remove quotes in haml
2019-07-08 10:05:13 +12:00
Brenda Wallace
e6a60e93c9
remove quotes in haml
2019-07-08 10:04:56 +12:00
Brenda Wallace
3859122fa5
tidy
2019-07-08 10:04:08 +12:00
Brenda Wallace
c61f13625c
Moved html into haml instead of html_safe in helper
2019-07-08 09:52:33 +12:00
Brenda Wallace
1c50d9e50d
rename blog_icon to post_icon
2019-07-08 09:42:06 +12:00
Brenda Wallace
b1edf8542e
Removed slug from query
2019-07-08 09:40:21 +12:00
Brenda Wallace
81723d99d9
make comment icon match other icons
2019-07-08 09:36:47 +12:00
Brenda Wallace
b1fdb5242a
simplifying resolving models
2019-07-08 09:34:48 +12:00
Brenda Wallace
e26c6d52a4
Further DRYing
2019-07-08 09:31:50 +12:00
Brenda Wallace
933c78b4e5
DRY members#show view
2019-07-08 09:19:44 +12:00
Brenda Wallace
7a4312f41e
Dry up timeline code
2019-07-08 09:19:26 +12:00
Brenda Wallace
03dfcdcc57
rubocop lint fix ups
2019-07-08 09:04:58 +12:00
Brenda Wallace
fe81923ae1
DRY timeline view
2019-07-08 09:04:19 +12:00
Brenda Wallace
ca281b84cb
Merge remote-tracking branch 'upstream/dev' into following-page
2019-07-07 22:09:39 +12:00
Brenda Wallace
528e4c2c85
button to get to timeline
2019-07-07 22:08:42 +12:00
Brenda Wallace
050dfda77e
Timeline
2019-07-07 22:03:15 +12:00
Brenda Wallace
d40c985d49
Merge pull request #2006 from Growstuff/dev
...
Release 55
2019-07-07 08:38:57 +12:00
Brenda Wallace
cc271b2cc3
Back out the max homepage items change
2019-07-06 11:16:21 +00:00
Brenda Wallace
eda77365a5
truncate long locations
2019-07-06 11:16:21 +00:00
Brenda Wallace
8528f80678
Layout fix up on hompage for large screens
2019-07-06 11:16:21 +00:00
Brenda Wallace
7266f6b590
include some interesting members in percy spec
...
so they show on the home page
2019-07-06 12:08:34 +12:00
Brenda Wallace
f8aff32168
Back out the max homepage items change
2019-07-06 11:04:10 +12:00
Brenda Wallace
1281f78d40
truncate long locations
2019-07-06 11:04:10 +12:00
Brenda Wallace
997a30d1bc
Layout fix up on hompage for large screens
2019-07-06 11:04:10 +12:00
Miles Gould
ba1512a85a
Delete duplicate percentage_grown attribute
...
Fixes #2031
2019-07-05 10:49:29 +00:00
dependabot-preview[bot]
b483c47258
Bump faker from 1.9.4 to 1.9.5
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.4 to 1.9.5.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/1.9.4...v.1.9.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-05 07:33:07 +00:00
Brenda Wallace
77f309c083
Merge pull request #2017 from Br3nda/upgrade/bootstrap-43
...
Upgrade boostrap gem
2019-07-05 10:18:33 +12:00
Brenda Wallace
cdc3be0414
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-05 10:05:44 +12:00
Brenda Wallace
136aff87ac
Removign empty class in scss
2019-07-04 10:36:25 +00:00
Brenda Wallace
826c8845a2
Removing commented out cruft
2019-07-04 10:36:25 +00:00
Brenda Wallace
5e7445f770
Merge branch 'dev' into UTFGardenNames
2019-07-04 10:56:46 +12:00
Brenda Wallace
a880aae748
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-04 08:07:29 +12:00
Brenda Wallace
5cb220caeb
Merge pull request #2025 from Growstuff/dependabot/npm_and_yarn/js-yaml-3.13.1
...
Bump js-yaml from 3.12.1 to 3.13.1
2019-07-04 07:27:10 +12:00
dependabot[bot]
0fa6fa9e5a
Bump js-yaml from 3.12.1 to 3.13.1
...
Bumps [js-yaml](https://github.com/nodeca/js-yaml ) from 3.12.1 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases )
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.1...3.13.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2019-07-03 10:51:41 +00:00
Brenda Wallace
904e30c9dd
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-03 22:47:20 +12:00
Brenda Wallace
d53393b0ca
Fix downcase
2019-07-03 09:39:32 +00:00
Brenda Wallace
ea18c722ef
lower caseon pluralizing
2019-07-03 09:39:32 +00:00
Brenda Wallace
ac91450827
Fixes count on members'cards
2019-07-03 09:39:32 +00:00
dependabot-preview[bot]
b0a47f1319
Bump webdrivers from 4.0.1 to 4.1.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.0.1 to 4.1.0.
- [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.0.1...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-03 08:28:06 +00:00
Brenda Wallace
bd1f8e1e05
Merge branch 'upgrade/bootstrap-43' of github.com:br3nda/growstuff into upgrade/bootstrap-43
2019-07-03 12:04:23 +12:00
Brenda Wallace
52b6ab3931
Output and stop on error
2019-07-03 12:04:13 +12:00
Brenda Wallace
8b22004066
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-03 09:58:04 +12:00
Miles Gould
a18ff03599
Fix remaining uses of devise_error_messages!
2019-07-02 21:57:43 +00:00
Brenda Wallace
9e1415dedd
fixes flex/wrap on home page members
2019-07-03 08:54:08 +12:00
Brenda Wallace
4495d03899
Move percy specs to static check run
2019-07-03 08:48:35 +12:00
Brenda Wallace
cc7ebf086f
Merge remote-tracking branch 'origin/upgrade/bootstrap-43' into upgrade/bootstrap-43
2019-07-03 08:41:34 +12:00
Brenda Wallace
50945c6f75
Files should end with a trailing newline
2019-07-03 08:41:23 +12:00
Brenda Wallace
c791b21c47
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-03 08:41:01 +12:00
Brenda Wallace
8c02ea943a
Tidy up photo display (line up)
2019-07-03 08:25:23 +12:00
Brenda Wallace
b90f6d5ff6
Tidy up facts on plantings#show
2019-07-03 08:20:58 +12:00
Brenda Wallace
036fea1c03
Fix scss compile error, by using our own variable
2019-07-03 08:16:46 +12:00
Brenda Wallace
13450f64ed
Squish a devise deprecation warning
2019-07-02 09:41:40 +00:00
Brenda Wallace
ad888575a5
Upgrade boostrap gem
2019-07-02 16:55:15 +12:00
Brenda Wallace
5ad298e43a
TYPO!
2019-07-02 04:52:39 +00:00
Brenda Wallace
67239ec8b1
rubocop fixup
2019-07-02 04:52:39 +00:00
Brenda Wallace
fda4d88e5a
Fix up locale spec
2019-07-02 04:52:39 +00:00
Brenda Wallace
b56771f9b7
specs for comments on profile pages
2019-07-02 04:52:39 +00:00
Brenda Wallace
4f59ef2e43
more profile page specs
2019-07-02 04:52:39 +00:00
Brenda Wallace
d37c4139a6
Fixes error displaying plantings with no planted_at date
2019-07-02 04:52:39 +00:00
Brenda Wallace
bf6cb5352d
Test for displaying plantings on profile page
2019-07-02 04:52:39 +00:00
Brenda Wallace
97028bdf1d
Refactoring member profile spec to use shared example
...
so we can test the page both signed in and not signed in
2019-07-02 04:52:39 +00:00
Brenda Wallace
ce60d6bb0c
Remove stray \n in translation
2019-07-01 10:28:39 +00:00
dependabot-preview[bot]
0870342871
Bump capybara from 3.24.0 to 3.25.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.24.0 to 3.25.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.24.0...3.25.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-29 02:07:39 +00:00
Brenda Wallace
c4657f5972
Merge pull request #1942 from Br3nda/upgrade/bootstrap
...
Upgrade to bootstrap 4
2019-06-28 10:05:02 +12:00
Brenda Wallace
fec37368ae
Remove pyenv
2019-06-28 09:53:23 +12:00
Brenda Wallace
8faa712e07
be_success -> be_successfull
...
fixes a deprecation warning
2019-06-27 22:26:15 +12:00
Brenda Wallace
b0a8288330
Merge branch 'dev' into upgrade/bootstrap
2019-06-27 22:18:06 +12:00
Brenda Wallace
6b7378c8f6
Merge branch 'master' into dev
2019-06-27 22:17:45 +12:00
Brenda Wallace
b65f2e858f
update rubocop to match codeclimate settings
2019-06-27 22:14:48 +12:00
Brenda Wallace
fe7cb43c11
prettier links
2019-06-27 22:13:23 +12:00
Brenda Wallace
f1097e0f7c
update photos spec
2019-06-27 22:13:09 +12:00
Brenda Wallace
66a0d8f2d0
only show info+pagination if there are results to show
2019-06-27 22:06:54 +12:00
Brenda Wallace
952c1b9a2a
styled and moved the signin/signup prompts
2019-06-27 22:04:54 +12:00
Brenda Wallace
9e69f0aae3
photos as cards
2019-06-27 22:00:46 +12:00
Brenda Wallace
d4a4d61f6b
tidy up photo display
2019-06-27 21:59:15 +12:00
Brenda Wallace
19085ed237
fixed link to harvest or plantings photos
2019-06-27 21:54:29 +12:00
Brenda Wallace
d1e7ba701b
fixing mobile display
2019-06-27 21:48:48 +12:00
Brenda Wallace
c94b026c58
solving rubocop dependencies errors
2019-06-27 21:33:25 +12:00
Brenda Wallace
8b3adcf7a7
Rubocop fix up
2019-06-27 21:26:35 +12:00
Brenda Wallace
b9e38719ce
Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
...
Conflicts:
Gemfile.lock
2019-06-27 21:25:00 +12:00
Brenda Wallace
677b82a3d0
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-27 21:23:52 +12:00
dependabot-preview[bot]
1ae0558e4c
Bump puma from 3.12.1 to 4.0.0
...
Bumps [puma](https://github.com/puma/puma ) from 3.12.1 to 4.0.0.
- [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.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-27 02:48:00 +00:00
Brenda Wallace
70a69e7220
Update app/assets/stylesheets/_predictions.scss
2019-06-27 14:45:42 +12:00
Brenda Wallace
7f2afa718d
Update app/assets/stylesheets/_predictions.scss
2019-06-27 14:45:22 +12:00
Brenda Wallace
dc6034c01b
Update app/assets/stylesheets/_variables.scss
2019-06-27 14:45:06 +12:00
Brenda Wallace
ea2e0697a7
Update Gemfile
2019-06-27 14:44:30 +12:00
Brenda Wallace
99f97f51dc
Update app/assets/stylesheets/_variables.scss
2019-06-27 14:43:38 +12:00
Brenda Wallace
9dada23e42
Marking the tests that fail as pending
...
Until we fix in chrome head less
2019-06-27 14:31:22 +12:00
dependabot-preview[bot]
f2c6f27c10
Bump scout_apm from 2.5.0 to 2.5.1
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.5.0 to 2.5.1.
- [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.5.0...v2.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-26 19:25:47 +00:00
dependabot-preview[bot]
53636dc47a
Bump rubocop from 0.71.0 to 0.72.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.71.0 to 0.72.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.71.0...v0.72.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-26 19:07:41 +00:00
Brenda Wallace
3bcfc88856
Add title to page
2019-06-26 16:30:55 +12:00
Brenda Wallace
1d98668ac4
scss lint
2019-06-26 16:21:59 +12:00
Brenda Wallace
88025b8a21
scss lint
2019-06-26 11:32:02 +12:00
Brenda Wallace
c60162e415
scss lint
2019-06-26 11:31:37 +12:00
Brenda Wallace
c702623c4f
Prefer single quoted strings
2019-06-26 11:31:10 +12:00
Brenda Wallace
0324e515e0
scss lint
2019-06-26 11:30:47 +12:00
Brenda Wallace
3dac09968d
Remove empty rule
2019-06-26 11:30:30 +12:00
Brenda Wallace
aa3297f4da
scss lint
2019-06-26 11:29:41 +12:00
Brenda Wallace
a361e804ee
scss lint
2019-06-26 11:27:19 +12:00
Brenda Wallace
db57432fee
scss lint
2019-06-26 11:26:52 +12:00
Brenda Wallace
d955dea240
scss lint
2019-06-26 11:26:36 +12:00
Brenda Wallace
d5e22d3285
scss lint
2019-06-26 11:26:14 +12:00
Brenda Wallace
6634465c1f
new line at end
2019-06-26 11:25:27 +12:00
Brenda Wallace
7a613b5dcc
Merge scss
2019-06-26 11:25:10 +12:00
Brenda Wallace
b176ba59dc
removed byline method
...
avoiding use of htmlseafe
2019-06-26 11:21:40 +12:00
Brenda Wallace
264506ef38
Move crop wrangling view test to feature spec
2019-06-26 11:16:41 +12:00
Brenda Wallace
382169b19c
MAtch button label in spec
2019-06-26 11:13:21 +12:00
Brenda Wallace
ef43399ffd
Match spec to page. h3 -> h5
2019-06-26 11:12:09 +12:00
Brenda Wallace
c540bd88fc
add back a div the specs look for
2019-06-26 10:51:10 +12:00
Brenda Wallace
6383bd73d6
Tidy up display of member avatar on seeds
2019-06-26 10:22:32 +12:00
Brenda Wallace
38a0b76eaa
add id to header search for input, so specs pass
2019-06-26 10:08:34 +12:00
Brenda Wallace
a3f25a4526
use another variable in scss
2019-06-26 10:08:19 +12:00
Brenda Wallace
c12f39d5d1
set ID on crop search form
2019-06-26 10:03:19 +12:00
Brenda Wallace
faefc0b293
the --rails flag isn't needed for rubocop anymore
2019-06-26 09:46:31 +12:00
Brenda Wallace
389b48d918
Use variables for scss colours
2019-06-26 09:45:01 +12:00
Brenda Wallace
6accfee811
Removed unnecsary colouring
2019-06-26 09:44:26 +12:00
Brenda Wallace
3488b29142
Removed empty rule
2019-06-26 09:43:57 +12:00
Brenda Wallace
db55432d31
SCSS lint fixes
2019-06-26 09:39:50 +12:00
Brenda Wallace
cc219a8aa2
remove commented out code
2019-06-26 09:39:01 +12:00
Brenda Wallace
a729a61f40
remove comments out styles
2019-06-26 09:37:54 +12:00
Brenda Wallace
3f59fe6bc7
style login buttons as buttons
2019-06-26 09:35:50 +12:00
Brenda Wallace
5efdf80bc2
lint
2019-06-26 09:35:35 +12:00
Brenda Wallace
b2c6a85aa9
use variable for colour
2019-06-26 09:35:21 +12:00
Brenda Wallace
b21b95bbc2
scss lint fixes
2019-06-26 09:31:19 +12:00
Brenda Wallace
5e15912371
Adding owner to planting in spec, so it passes
2019-06-26 09:23:22 +12:00
Brenda Wallace
d50ae70824
in the spec, visit the path, not the full url
2019-06-26 09:14:01 +12:00
Brenda Wallace
e020db7eef
travici needs to call search:reindex
2019-06-26 09:13:12 +12:00
Brenda Wallace
1df19ead92
removed phantom
2019-06-26 09:12:57 +12:00
Brenda Wallace
06ae5ecd6f
DRY buttons
2019-06-26 09:12:39 +12:00
Brenda Wallace
73f2fd2323
fix another deprecation warning about rails 6
2019-06-26 09:07:03 +12:00
Brenda Wallace
474732f909
Fix sql warning in logs
2019-06-26 09:05:14 +12:00
Brenda Wallace
5b977964e8
Fixing deprecation warning by devise
2019-06-26 09:04:38 +12:00
Brenda Wallace
a69e4020d7
back to reading gardens from the plantings
2019-06-26 08:09:49 +12:00
Brenda Wallace
a598214a60
renamed scss files
2019-06-25 21:34:52 +12:00
Brenda Wallace
73f7e695b4
Ignore leaflet
2019-06-25 21:32:13 +12:00
Brenda Wallace
30728d8146
Rule declaration should be followed by an empty line
2019-06-25 21:31:38 +12:00
Brenda Wallace
ee2d169c1d
Unknown property align
2019-06-25 21:31:24 +12:00
Brenda Wallace
92f0453d25
Alpha ordered css
2019-06-25 21:30:55 +12:00
Brenda Wallace
c6bb21cdfa
0.5 should be written without a leading zero as .5
2019-06-25 21:30:25 +12:00
Brenda Wallace
56bae53295
0.1 should be written without a leading zero as .1
2019-06-25 21:29:50 +12:00
Brenda Wallace
c6b7696558
Files should end with a trailing newline
2019-06-25 21:29:30 +12:00
Brenda Wallace
b77693c82f
Imported partial bootstrap/variables.scss should be written as bootstrap/variables
2019-06-25 21:29:13 +12:00
Brenda Wallace
ea4d48184b
Delete trailing spaces
2019-06-25 21:13:09 +12:00
Brenda Wallace
5f3a180f9c
restore <title> on harvests#index
2019-06-25 21:12:09 +12:00
Brenda Wallace
7f00a5063b
view spec updates
2019-06-25 21:06:32 +12:00
Brenda Wallace
ec1824fd4f
Remove comment specs, they're on another view now
2019-06-25 20:56:57 +12:00
Brenda Wallace
702a66dea9
Update spec for editing gardens
2019-06-25 20:45:54 +12:00
Brenda Wallace
103d1ce2eb
rubocop lint
2019-06-25 20:39:50 +12:00
Brenda Wallace
58d08ceb5a
fix look up of translation for homepage
2019-06-25 20:35:40 +12:00
Brenda Wallace
4a09394485
Remove crop name test from homepage members list
2019-06-25 20:33:18 +12:00
Brenda Wallace
20e236fb4b
more spec updates
2019-06-25 20:31:15 +12:00
Brenda Wallace
72a0c07a93
Added member location back to match specs
2019-06-25 16:29:52 +12:00
Brenda Wallace
4f04d843a3
Move the subquerys in members#show to private
2019-06-25 16:18:15 +12:00
Brenda Wallace
1dd9a1028e
Updating the way we look for the plantparts radio buttons in specs
2019-06-25 16:17:43 +12:00
Brenda Wallace
b1b6de0aae
set @gardens for plantings controller and spec
2019-06-25 15:55:06 +12:00
Brenda Wallace
3d065c72ba
update new planting view spec
2019-06-25 15:54:50 +12:00
Brenda Wallace
3dab7b89f9
update planting specs
2019-06-25 15:36:08 +12:00
Brenda Wallace
dce1ab6239
Format the output from rspec
2019-06-25 15:24:53 +12:00
Brenda Wallace
e2a764e8bc
call search:reindex on ci runs
2019-06-25 15:18:31 +12:00
Brenda Wallace
aab2f75caa
use console.log instead of alert
...
so our headless chrome doesn't get stuck on the alert
2019-06-25 15:15:16 +12:00
Brenda Wallace
5150e8e2a7
Plant part is a radio button now. updating spec
2019-06-25 13:43:30 +12:00
Brenda Wallace
4fc7e0d0b2
fix up home spec
2019-06-25 13:28:08 +12:00
Brenda Wallace
8af856f990
Updating specs
2019-06-25 11:36:23 +12:00
Brenda Wallace
d7e4863f02
bundle install results
2019-06-25 10:12:34 +12:00
Brenda Wallace
5de269c097
Move header into partial, to match what specs expect
2019-06-25 10:12:12 +12:00
Brenda Wallace
64864bfcd5
Remove phantom directory mention from travis config
2019-06-25 09:09:28 +12:00
Brenda Wallace
0171e67b7e
Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
...
Conflicts:
Gemfile.lock
2019-06-25 09:08:42 +12:00
dependabot-preview[bot]
f7406de7dc
Bump scout_apm from 2.4.24 to 2.5.0
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.4.24 to 2.5.0.
- [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.4.24...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-24 21:07:32 +00:00
Brenda Wallace
3e0f6c476f
set body on post in spec, so we know what to look for
...
and we don't trip on whitespace changes
2019-06-25 09:01:37 +12:00
Brenda Wallace
191a3940d7
update unlock spec
2019-06-25 08:57:37 +12:00
Brenda Wallace
5dc4c4fcde
update from should rspec syntax
2019-06-25 08:54:53 +12:00
Brenda Wallace
1747f810e3
Match to existing specs
2019-06-25 08:54:40 +12:00
Brenda Wallace
723c312412
Updating forum pages to match specs
2019-06-24 21:35:01 +12:00
Brenda Wallace
47c5e36692
Updating forum specs
2019-06-24 21:30:06 +12:00
Brenda Wallace
4443ce9d8b
Update spec to find first garden actions link
2019-06-24 20:08:02 +12:00
Brenda Wallace
c4534c28de
Update planting finished from quick menus
2019-06-24 19:59:17 +12:00
Brenda Wallace
3f24fbe181
rubocop linting
2019-06-24 18:38:28 +12:00
Brenda Wallace
926915aca0
Update rss spec
...
we can't check status codes anymore
2019-06-24 18:29:18 +12:00
Brenda Wallace
c797f33c08
add title back to places search
2019-06-24 18:12:48 +12:00
Brenda Wallace
2546d0c704
Split the search places spec, to quicker see what broke
2019-06-24 18:11:08 +12:00
Brenda Wallace
cafc514ee5
spec updates
2019-06-24 18:06:32 +12:00
codefactor-io
f24ae3aafb
[CodeFactor] Apply fixes
2019-06-18 06:45:30 +00:00
Brenda Wallace
52403d8dd6
Pin elasticsearch back at 6, to fix errors on staging/prod
2019-06-18 06:45:30 +00:00
Brenda Wallace
fcf4e0f15d
Icons from icon8, used with permission
2019-06-17 10:42:47 +12:00
Brenda Wallace
7fc434bd00
remove whitespace
2019-06-17 10:40:34 +12:00
Brenda Wallace
f35444bf9e
add href to the plantings quick actions links
2019-06-17 10:40:23 +12:00
Brenda Wallace
02b312ea81
Gardens actions in the actions menu, and needing the confirm
2019-06-17 10:39:51 +12:00
Brenda Wallace
ea261748c3
Update crop spec to expect the full size photos
2019-06-16 21:14:31 +12:00
Brenda Wallace
941dc498f0
Fix homepage links!
2019-06-16 17:07:04 +12:00
Brenda Wallace
a11193dcc6
show date planted
2019-06-16 17:06:49 +12:00
Brenda Wallace
b9dcd9e5b9
Added missing icons
2019-06-16 17:06:33 +12:00
Brenda Wallace
ef91e26d28
rubocop lint fixes
2019-06-16 10:31:03 +12:00
Brenda Wallace
391874e27e
rubocop lint fixes
2019-06-16 10:30:09 +12:00
Brenda Wallace
31e1545a21
comment out status code test until it works with chrome headless
2019-06-16 10:28:19 +12:00
Brenda Wallace
36897433bf
login can be email or loginname
2019-06-16 10:23:51 +12:00
Brenda Wallace
505f0b24d3
tidy up crops photos
2019-06-15 22:53:10 +12:00
Brenda Wallace
8ca5098f0f
photos display tidy up
2019-06-15 22:35:39 +12:00
Brenda Wallace
67d90ec6f0
mark status test as pending until we work out how on headless chrome
2019-06-15 22:20:51 +12:00
Brenda Wallace
6eea0c4a8e
Restore message button
2019-06-15 21:42:41 +12:00
Brenda Wallace
70bfcabaec
Add seeds to member profile, and update specs
2019-06-15 21:18:10 +12:00
Brenda Wallace
adb0a1043d
Move gardens specs to gardens folder
2019-06-15 20:07:48 +12:00
Brenda Wallace
d2fdb499ed
Move member specs to members folder
2019-06-15 20:05:18 +12:00
Brenda Wallace
e678cc3841
can't check status code - so check text instead
2019-06-15 19:40:02 +12:00
Brenda Wallace
4b0b91c4d9
Update spec for editing seeds
2019-06-15 19:13:11 +12:00
Brenda Wallace
cf8182d793
Merge branch 'dev' into upgrade/bootstrap
2019-06-15 19:00:51 +12:00
Brenda Wallace
9fb07501bb
click actions in menu when capybara test is adding photos
2019-06-15 18:59:11 +12:00
Brenda Wallace
7bc497d92c
add href to seeds actions so capybara can find it
2019-06-15 18:56:30 +12:00
Brenda Wallace
6d15f1393e
confirm the alert dialogue when deleting
2019-06-15 18:53:21 +12:00
Brenda Wallace
9993c610cb
Update rego form, so it matches the specs
2019-06-15 18:20:51 +12:00
Brenda Wallace
8599543daf
actions menu is a link, not a button. fix spec
2019-06-15 17:13:22 +12:00
Brenda Wallace
2a0c93ed1a
wrangle menu - and capybara needs to have screen size big enough to see the menu
2019-06-15 17:11:40 +12:00
Brenda Wallace
3bc69e65c2
Click actions menu before checking for links in garden feature specs
2019-06-15 15:18:32 +12:00
Brenda Wallace
d21cbf994b
poltergeist work around not needed anymore
2019-06-15 14:34:49 +12:00
Brenda Wallace
e639c63565
Link to production at top of readme
2019-06-15 13:21:41 +12:00
Brenda Wallace
6abf717234
crop is required on seeds form
2019-06-15 10:59:06 +12:00
Brenda Wallace
71e8f6f76c
tradeable is required fields
2019-06-15 10:56:56 +12:00
Brenda Wallace
bfe3e1ea69
Updated labels to look for in spec for adding seeds
2019-06-15 08:50:34 +12:00
Brenda Wallace
d82d20743c
Add the required class back to seeds form
2019-06-15 08:49:18 +12:00
Brenda Wallace
29ae663a47
we don't need to manually trigger javascript events anymore
2019-06-15 08:36:10 +12:00
Brenda Wallace
fe7bc0f721
tidy up link hovers
2019-06-15 08:33:17 +12:00
Brenda Wallace
4ed80dde7b
More contrast in colours
2019-06-15 08:25:23 +12:00
Brenda Wallace
ad67b66313
buttons on homepage blurb
2019-06-15 08:25:11 +12:00
Brenda Wallace
9e7e1adfd3
Merge branch 'dev' into upgrade/bootstrap
2019-06-15 08:23:26 +12:00
Brenda Wallace
71af9c7b76
Merge pull request #1991 from Growstuff/dev
...
Production release
2019-06-15 08:10:52 +12:00
Brenda Wallace
d4c328a8b0
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-15 08:08:27 +12:00
Brenda Wallace
45ba712eb7
Fix database connection to share with capybara
...
and the database cleaner to use transactions, not truncation
2019-06-15 08:06:54 +12:00
dependabot-preview[bot]
2917be8158
Bump capybara from 3.23.0 to 3.24.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.23.0 to 3.24.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.23.0...3.24.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-14 19:06:31 +00:00
dependabot-preview[bot]
4c2fb13eaa
Bump jquery-rails from 4.3.3 to 4.3.5
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v4.3.3...v4.3.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-14 18:48:55 +00:00
Brenda Wallace
44fbae6776
Use comments for blog icon
...
So it doesn't look like an edit button
2019-06-14 21:30:04 +12:00
Brenda Wallace
cb1dcc9f8f
variables for scss
2019-06-14 21:10:02 +12:00
Brenda Wallace
43fea8f905
style the navbar search
2019-06-14 21:09:46 +12:00
Brenda Wallace
d93fdd02e3
get specs for browsing crops working
2019-06-14 20:39:42 +12:00
Brenda Wallace
6259d72ce0
delete link on drops needs href
2019-06-14 20:32:38 +12:00
Brenda Wallace
4fa4286670
dismiss the alert when deleting crops
2019-06-14 20:32:12 +12:00
Brenda Wallace
e46becac10
give link a href so capybara can find it
2019-06-14 20:22:35 +12:00
Brenda Wallace
40c75e0109
Delete needs confirmations in the specs
2019-06-14 18:12:33 +12:00
Brenda Wallace
f73b260212
replace existing database cleaner
...
the old one doesn't play nice with capybara
2019-06-14 18:06:41 +12:00
Brenda Wallace
5816b6c64c
Removed comment show spec. Page doesn't exist now
2019-06-14 17:10:03 +12:00
Brenda Wallace
551d6f9aa3
Bump up line length
2019-06-14 16:43:25 +12:00
Brenda Wallace
7564a87232
Bring back rails rubocops
2019-06-14 16:42:09 +12:00
Brenda Wallace
ad6ec0473c
Sort gems
2019-06-14 16:39:59 +12:00
Brenda Wallace
b9e2154edb
rubocop lint
2019-06-14 16:39:25 +12:00
Brenda Wallace
2fc3c33520
rubocop lint
2019-06-14 16:38:49 +12:00
Brenda Wallace
f98c33e688
wrap long line
2019-06-14 16:38:20 +12:00
Brenda Wallace
8eb299c146
only show actions menu if you can do the actions
2019-06-14 16:36:04 +12:00
Brenda Wallace
115b0925cd
Sorting css
2019-06-14 16:32:16 +12:00
Brenda Wallace
cfb1cd798f
Removing un-used css
2019-06-14 16:31:43 +12:00
Brenda Wallace
b259ac5b43
New line at end of file
2019-06-14 16:31:20 +12:00
Brenda Wallace
3ae8900b05
Sorting css
2019-06-14 16:31:01 +12:00
Brenda Wallace
27b1b5e8db
prefer single quotes
2019-06-14 16:30:26 +12:00
Brenda Wallace
dc0607c42a
Remove duplicated translations
2019-06-14 16:28:13 +12:00
Brenda Wallace
d98cb87d95
Wrapped long line
2019-06-14 16:27:28 +12:00
Brenda Wallace
43d300820c
indentation fix
2019-06-14 16:26:31 +12:00
Brenda Wallace
dea14ff0ff
Add new line at end of file
2019-06-14 16:26:06 +12:00
Brenda Wallace
6143d88576
Remove trailing whitespace
2019-06-14 16:24:51 +12:00
Brenda Wallace
5cedea9da8
removing trailing whitespace
2019-06-14 16:23:31 +12:00
Brenda Wallace
19350e7aa0
Removing phantom
2019-06-14 16:15:49 +12:00
Brenda Wallace
0d252bf3d3
Add chrome, from apt, on travis-ci
2019-06-14 16:14:59 +12:00
Brenda Wallace
d98e94bd21
Switch from poltergeist to selenium chrome headless
2019-06-14 16:13:53 +12:00
Brenda Wallace
58ffcb281f
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-14 16:06:44 +12:00
Brenda Wallace
19eae7d259
crop search form on white background
...
for readability
2019-06-14 16:06:32 +12:00
Daniel O'Connor
28f68717f5
Address code climate concerns by extracting query methods
2019-06-14 13:36:20 +09:30
Brenda Wallace
d7b973e684
Add harvest predictions to homepage blurb
2019-06-14 15:58:27 +12:00
Brenda Wallace
465c7c7b6d
Move crop form error messages to alert
2019-06-14 15:54:04 +12:00
Brenda Wallace
6c23302435
Fix duplicate labels on crop form
2019-06-14 15:52:05 +12:00
Brenda Wallace
feb11811a5
badges were overlapping the menu
2019-06-14 15:35:22 +12:00
Brenda Wallace
f2e87c9863
elipsis when photo title is too long
2019-06-14 15:31:16 +12:00
Brenda Wallace
6d18400a8b
turn off all link hover underlines
2019-06-14 15:22:53 +12:00
Brenda Wallace
c5988ded4e
tidy up badges and progress bar
2019-06-14 15:21:06 +12:00
Brenda Wallace
533c9aefdb
push the link to bottom of member cards
2019-06-14 15:14:22 +12:00
Brenda Wallace
5ec29b40d0
tidy up sci name action menu
2019-06-14 15:08:01 +12:00
Brenda Wallace
ab3f65742f
better hover on members avatar
2019-06-14 15:07:44 +12:00
Brenda Wallace
62302b3fd7
Fix round display of member avatars
2019-06-14 15:06:55 +12:00
Brenda Wallace
3863c0e0e8
These colours returned
2019-06-14 15:06:39 +12:00
Brenda Wallace
35fa2122b8
padding on thumbnail photos
2019-06-14 12:20:55 +12:00
Brenda Wallace
bd6533ccc3
Revert "Revert "DRY the photos helper""
...
This reverts commit 7f7f2cae47 .
2019-06-14 12:01:33 +12:00
Brenda Wallace
0af9fe0e4c
Updated a wierd spec on crop.photos.size that looked wrong
2019-06-14 12:00:41 +12:00
Brenda Wallace
7f7f2cae47
Revert "DRY the photos helper"
...
This reverts commit 798fff43cf .
2019-06-14 11:52:10 +12:00
Brenda Wallace
2949abd6bf
SEt subject of post in spec, so it matches the tests
2019-06-14 11:47:15 +12:00
Brenda Wallace
58e28b9311
nicer link to member gardens
2019-06-14 11:45:55 +12:00
Brenda Wallace
e0b9acc27d
Tidier link to member posts
2019-06-14 11:27:43 +12:00
Brenda Wallace
6086a1aaa5
strip tags on subjects
2019-06-14 11:26:29 +12:00
Brenda Wallace
bd8ab9365d
padding on member icon
2019-06-14 11:26:11 +12:00
Brenda Wallace
def468827c
Update helper spec
2019-06-14 11:21:23 +12:00
Brenda Wallace
798fff43cf
DRY the photos helper
2019-06-14 11:20:06 +12:00
Brenda Wallace
c0b2a8431b
Reinstate likes
2019-06-14 11:01:16 +12:00
Brenda Wallace
22e7a85388
inline search form on crops#search
2019-06-14 10:54:30 +12:00
Brenda Wallace
6e9207c2ed
Fix tabulation error in haml
2019-06-14 10:13:02 +12:00
Brenda Wallace
f8e9cd8fbf
Tidy up photo associations on photos#show
2019-06-14 10:11:55 +12:00
Brenda Wallace
9a5ebc5260
rename photos/photo_associations to photos/associations
2019-06-14 10:06:48 +12:00
Brenda Wallace
4cedc6e262
Action menus for photos#show
2019-06-14 10:03:51 +12:00
Brenda Wallace
729254ac24
added href to link so capybara finds it
2019-06-14 10:00:28 +12:00
Brenda Wallace
c0c1b1df70
Tidy up on photos#new
2019-06-14 09:56:12 +12:00
Brenda Wallace
6db1c7b327
Merge remote-tracking branch 'refs/remotes/origin/upgrade/bootstrap'
...
Conflicts:
spec/features/harvests/harvesting_a_crop_spec.rb
2019-06-13 23:06:51 +12:00
Brenda Wallace
52edaae43b
update harvest spec to find edit behind actions menu
2019-06-13 23:05:59 +12:00
Brenda Wallace
6f036271c5
update harvest spec to find edit behind actions menu
2019-06-13 23:05:02 +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
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
Brenda Wallace
80e8364de0
title on planting thumbnails
2019-06-09 14:02:30 +12:00
Brenda Wallace
2fa4590315
gardens breadcrumbs
2019-06-09 14:02:13 +12:00
Brenda Wallace
4255cde5ff
member cards on home page fix up
2019-06-09 13:24:05 +12:00
Brenda Wallace
5957309dea
Update harvest spec
2019-06-09 10:16:34 +12:00
Brenda Wallace
cf3068dc08
card display on small screens
2019-06-09 10:05:31 +12:00
Brenda Wallace
0572c4678b
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-09 09:54:47 +12:00
Brenda Wallace
c7ae520d66
add missing translation for "Record Harvest"
2019-06-09 09:54:28 +12:00
Brenda Wallace
4fd24e61d9
harvest own on card
2019-06-09 09:54:09 +12:00
Brenda Wallace
0cbc224298
remove commented out code
2019-06-09 09:53:56 +12:00
Brenda Wallace
5c5abcde30
fix up titles
2019-06-09 09:53:46 +12:00
Brenda Wallace
0c4b9a800e
Use our own index-cards class for card layout instead of bootstrap grid
2019-06-09 09:53:31 +12:00
dependabot-preview[bot]
6587b7349f
Bump rubocop from 0.70.0 to 0.71.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.70.0 to 0.71.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.70.0...v0.71.0 )
2019-06-08 07:52:00 +00:00
dependabot-preview[bot]
f5fb95c975
Bump haml_lint from 0.31.0 to 0.32.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.31.0 to 0.32.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.31.0...v0.32.0 )
2019-06-08 07:21:09 +00:00
Brenda Wallace
3d11dac718
Fixing harvest specs
2019-06-08 18:21:15 +12:00
codefactor-io
977ff7d174
[CodeFactor] Apply fixes
2019-06-08 05:20:29 +00:00
Brenda Wallace
628a7e3ae1
Fix planting specs
2019-06-08 17:02:59 +12:00
Brenda Wallace
1526cea92a
required explanation test on plantings form
2019-06-08 16:02:19 +12:00
Brenda Wallace
f4457f877f
fixing planting specs
2019-06-08 16:02:06 +12:00
Brenda Wallace
eb628635e2
fix logic on planting.active
2019-06-08 15:39:14 +12:00
Brenda Wallace
8d3e080afb
classes for gardens button
2019-06-08 15:38:39 +12:00
Brenda Wallace
9b8638a3b6
tests for plantings.active scope
2019-06-08 15:38:27 +12:00
Brenda Wallace
532699a1ec
menu on the left, works better on mobile
2019-06-08 15:38:18 +12:00
Brenda Wallace
d2c062a3f1
garden actions
2019-06-08 14:57:29 +12:00
Brenda Wallace
fae3155237
match to spec
2019-06-08 14:57:11 +12:00
Brenda Wallace
51133359fb
tidy
2019-06-08 10:29:52 +12:00
Brenda Wallace
9b62d4609b
added back the plantings quick actions menu
2019-06-08 10:29:17 +12:00
Brenda Wallace
e3ddf61c4d
asterisk for required fields
2019-06-08 09:47:28 +12:00
Brenda Wallace
47fbfa815a
More room on gardens form
2019-06-08 09:31:53 +12:00
Brenda Wallace
e9103f500d
put autosuggest at tooltip level
2019-06-08 09:24:41 +12:00
Brenda Wallace
5f705c47c5
garden form name is required
2019-06-08 09:24:29 +12:00
Brenda Wallace
7965845ab2
crops show sidebar tidy up harvests and plantings
2019-06-08 09:24:18 +12:00
Brenda Wallace
8cc3bada0a
update spec to find elements on the new forms
2019-06-08 09:23:27 +12:00
Brenda Wallace
5a2f9f84d8
Comment for post deploy script in heroku config
2019-06-08 08:34:50 +12:00
Brenda Wallace
771730c916
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-08 08:28:05 +12:00
Brenda Wallace
fde3f06bdb
Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
...
Conflicts:
Gemfile.lock
2019-06-08 08:27:20 +12:00
Brenda Wallace
96eaba2a79
Needs bonsai to deploy on heroku
2019-06-08 08:23:56 +12:00
codefactor-io
b62f648042
[CodeFactor] Apply fixes
2019-06-07 10:38:58 +00:00
Brenda Wallace
ee7ea523e1
capitalise name in spec to match new view
2019-06-07 20:44:44 +12:00
Brenda Wallace
9e1d531de9
nil for perennial doesn't mean annual
2019-06-07 20:44:30 +12:00
Brenda Wallace
4fc460b2a2
Match to crops specs
2019-06-07 20:42:57 +12:00
Brenda Wallace
49069f4c4a
seeds button helper, for actions links
2019-06-07 20:36:14 +12:00
Brenda Wallace
06650a790d
active scopes on plantings and seeds
2019-06-07 20:36:02 +12:00
Brenda Wallace
3bcb34d336
Member cards with only the active data counted
2019-06-07 20:35:42 +12:00
Brenda Wallace
ffeaa08ff7
restore crops sidebar to match specs
2019-06-07 20:35:24 +12:00
Brenda Wallace
b1b24f5e0a
mark delete link as danger
2019-06-07 20:35:02 +12:00
Brenda Wallace
81f1a55aca
actions menu for seeds
2019-06-07 20:34:37 +12:00
Brenda Wallace
74bae31557
Max size for hero photo
2019-06-07 20:34:18 +12:00
Brenda Wallace
b608a0e3ac
Scientific name matching alt names
2019-06-07 14:08:13 +12:00
Brenda Wallace
a93aecdb3b
Alternate names specs
2019-06-07 14:01:21 +12:00
Brenda Wallace
c708608e9b
Tidy up members#show photo display
2019-06-07 13:09:29 +12:00
Brenda Wallace
b2ee3ee299
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-07 10:56:42 +12:00
Brenda Wallace
4ab140a15e
actions are now in the actoins menu. update spec
2019-06-06 22:30:28 +12:00
Brenda Wallace
78ea7d6a53
Crop wrangling is now under the admin menu - update spec
2019-06-06 22:30:17 +12:00
codefactor-io
2786476faa
[CodeFactor] Apply fixes
2019-06-06 08:37:27 +00:00
Brenda Wallace
6daca910ab
Fixed buttons on crops#show
2019-06-05 23:24:34 +12:00
Brenda Wallace
0715646688
Change crop autosuggest styles
2019-06-05 23:12:12 +12:00
Brenda Wallace
84ca2154f4
fix up footer
2019-06-05 22:58:12 +12:00
Brenda Wallace
fad43f18c8
missing titles, icons, and breadcrumps
2019-06-05 22:46:41 +12:00
Brenda Wallace
9cc97e10cd
tidy up crops sort form
2019-06-05 22:37:13 +12:00
Brenda Wallace
a7e83202fb
a margin below every card
2019-06-05 22:31:39 +12:00
Brenda Wallace
d346ae8e4b
tidy up crops#index on a small screen
2019-06-05 22:29:29 +12:00
Brenda Wallace
04d941111b
tidy up harvests#index on a small screen
2019-06-05 22:29:18 +12:00
Brenda Wallace
385ecac46f
Revert "Tidy up crops#index on small screens"
...
This reverts commit 5a5e0c8f82 .
2019-06-05 22:27:05 +12:00
Brenda Wallace
5a5e0c8f82
Tidy up crops#index on small screens
2019-06-05 22:19:05 +12:00
Brenda Wallace
eb1cb31f6a
fix alignment of header on members#show
2019-06-05 17:22:09 +12:00
Brenda Wallace
6af4bb9ecf
Fix tiny crop photos on small screens
2019-06-05 17:21:44 +12:00
Brenda Wallace
9b0eb212b1
Button back needs to wrap
2019-06-05 17:21:30 +12:00
Brenda Wallace
75cc2040b1
Expand maincontainer on small screens
2019-06-05 17:21:20 +12:00
Brenda Wallace
70afa97b80
only shrink the member card on the homepage
2019-06-05 08:35:39 +12:00
Brenda Wallace
75b04ffe04
attempting to make posts appear nice on mobile
2019-06-04 20:02:28 +12:00
Brenda Wallace
16f9f4c66e
plantings actions as dropdown menu
2019-06-04 20:02:02 +12:00
Brenda Wallace
0235f233ab
plantigns tidy for small screens
2019-06-04 15:45:23 +12:00
Brenda Wallace
abfe1ace20
harvest -> planting assignment form tidy for small screens
2019-06-04 15:45:13 +12:00
Brenda Wallace
b3bcce9583
plantings form tidy for small screens
2019-06-04 15:44:55 +12:00
Brenda Wallace
357b70f068
harvest form tidy for small screens
2019-06-04 15:44:45 +12:00
dependabot-preview[bot]
92c69af977
Bump chartkick from 3.0.2 to 3.1.0
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.0.2 to 3.1.0.
- [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.0.2...v3.1.0 )
2019-06-03 22:52:06 +00:00
dependabot-preview[bot]
1fb7b435e4
[Security] Bump axios from 0.18.0 to 0.18.1
...
Bumps [axios](https://github.com/axios/axios ) from 0.18.0 to 0.18.1. **This update includes security fixes.**
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/v0.18.1/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.18.0...v0.18.1 )
2019-06-03 22:17:36 +00:00
dependabot-preview[bot]
bd7adb5123
Bump capybara from 3.19.1 to 3.22.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.19.1 to 3.22.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.19.1...3.22.0 )
2019-06-03 22:00:54 +00:00
Brenda Wallace
ab4119c68d
make gardens for nicer on mobile
2019-06-03 23:19:15 +12:00
Brenda Wallace
c7d5915b44
Make seeds form nicer on mobile
2019-06-03 23:16:28 +12:00
Brenda Wallace
6c41b52cb1
Fix - planting.active scope to not show finished
2019-06-03 23:01:57 +12:00
Brenda Wallace
2dd4e95e7c
don't set max card
2019-06-03 22:47:43 +12:00
Brenda Wallace
cf69c13527
fix up erros on planting form
2019-06-03 22:47:19 +12:00
Brenda Wallace
f944ce11d0
margin on sect
2019-06-03 22:31:11 +12:00
Brenda Wallace
89f51c8a81
make the seed card wider
2019-06-03 22:25:08 +12:00
Brenda Wallace
14aa9a66df
Move crop photos into row
2019-06-03 22:24:55 +12:00
Brenda Wallace
09499499b7
bugfix - label on signup link
2019-06-03 22:24:22 +12:00
Brenda Wallace
f94199676c
fullsize garden images
2019-06-03 22:23:49 +12:00
Brenda Wallace
00010d3a0f
Breadcrumps
2019-06-03 22:23:36 +12:00
Brenda Wallace
6bc3291185
tidy up plantings
2019-06-03 22:23:06 +12:00
Brenda Wallace
11afea1c54
fixing plantings form
2019-06-03 22:22:53 +12:00
Brenda Wallace
7c45647ff2
gardens tidy up
2019-06-03 22:22:40 +12:00
Brenda Wallace
5255b5d572
More crops tidy up
2019-06-03 22:22:28 +12:00
dependabot-preview[bot]
17f696cf0e
Bump percy-capybara from 4.0.0 to 4.0.1
...
Bumps [percy-capybara]() from 4.0.0 to 4.0.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-31 21:51:05 +00:00
dependabot-preview[bot]
505e6a3219
Bump searchkick from 4.0.0 to 4.0.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.0.0 to 4.0.1.
- [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.0...v4.0.1 )
2019-05-31 21:20:15 +00:00
Brenda Wallace
1a15916c73
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-30 11:18:04 +12:00
Brenda Wallace
f7db832a0e
Match the tests further
2019-05-30 09:49:50 +12:00
Brenda Wallace
85410858cc
Tidy up the delete link in crops actions
2019-05-30 09:49:37 +12:00
codefactor-io
7f1bb7913c
[CodeFactor] Apply fixes
2019-05-29 21:48:42 +00:00
Brenda Wallace
e6c2e9abf6
Merge branch 'dev' into upgrade/bootstrap
2019-05-30 09:48:28 +12:00
Brenda Wallace
3f86c5a749
Update CONTRIBUTORS.md
2019-05-30 09:48:09 +12:00
Brenda Wallace
f0d49b7e9d
capitalize to match the specs
2019-05-29 15:46:42 +12:00
Brenda Wallace
210b912859
Home page tidy
2019-05-29 15:06:09 +12:00
Brenda Wallace
73996317d5
Fixing display on small screens
2019-05-29 10:48:56 +12:00
Brenda Wallace
2f4fc948db
Move overrides last
2019-05-29 10:48:26 +12:00
Brenda Wallace
390ac6587f
Seed cards title smaller, fit more on screen
2019-05-27 09:29:32 +12:00
Brenda Wallace
8d6e48ad3d
tidy up crops form
2019-05-27 09:27:43 +12:00
Brenda Wallace
27b3f5fac9
turn of shadow on thumbnails
2019-05-27 08:36:46 +12:00
Brenda Wallace
8d07cc6c39
More crops tidy
2019-05-27 08:36:35 +12:00
Brenda Wallace
e220b3dcd8
MAtching to the specs
2019-05-27 08:08:27 +12:00
Brenda Wallace
611c692624
Update CONTRIBUTORS.md
2019-05-27 03:46:11 +12:00
Brenda Wallace
8524b13333
Update CONTRIBUTORS.md
2019-05-27 03:45:37 +12:00
Brenda Wallace
df4f7de178
Add dependabot's new name
2019-05-27 03:42:39 +12:00
Brenda Wallace
180c8af89d
Merge pull request #1968 from Growstuff/dev-cf-autofix
...
Apply fixes from CodeFactor
2019-05-25 21:52:46 +12:00
Brenda Wallace
028e149338
button label matching spec
2019-05-25 19:17:53 +12:00
Brenda Wallace
223e61b8a8
Re-instate search title
2019-05-25 19:15:46 +12:00
Brenda Wallace
73c834adf3
added missing translation
2019-05-25 19:15:35 +12:00
Brenda Wallace
0811699020
USe search bar partial
2019-05-25 19:15:27 +12:00
Brenda Wallace
0d3bdc09ab
Tool tips on actions
2019-05-25 17:17:25 +12:00
Brenda Wallace
91894db0db
Remove unused grid sizer class
2019-05-25 17:02:26 +12:00
Brenda Wallace
ac52fb743c
tidy post display on small screens
2019-05-25 17:02:16 +12:00
Brenda Wallace
70d4b85f98
Member actions
2019-05-25 17:02:06 +12:00
Brenda Wallace
62214d6e36
allow plantings factor boxes to be bigger
2019-05-25 17:01:53 +12:00
Brenda Wallace
c7e4216a31
move global actions
2019-05-25 17:01:28 +12:00
Brenda Wallace
fcabfef8d9
Put planting owner details in a card
2019-05-25 15:19:15 +12:00
Brenda Wallace
1e03d15434
Move post actions to own file
2019-05-25 15:18:58 +12:00
Brenda Wallace
b21aa50203
Tidy up seeds on homepage
2019-05-25 15:18:43 +12:00
Brenda Wallace
94aa920360
Fix button id
2019-05-25 15:14:02 +12:00
Brenda Wallace
f822b32ac8
More Actions into drop down
2019-05-25 15:11:07 +12:00
Brenda Wallace
e4be6feaed
Tidy up forms form
2019-05-25 14:26:31 +12:00
Brenda Wallace
54f54f020a
Make sure we precompile the assets before running percy
2019-05-25 10:31:26 +12:00
Brenda Wallace
4c92c97aaa
Add names to admin pages in percy spec
2019-05-25 10:29:40 +12:00
Brenda Wallace
7ffefcf1b5
Add admin and crop wrangling to percy spec
2019-05-25 10:24:31 +12:00
Brenda Wallace
4caa30b2f5
button horizontal again
2019-05-25 10:22:57 +12:00
Brenda Wallace
6af086e94d
Tidy up percy specs for major #new pages
2019-05-25 10:04:16 +12:00
Brenda Wallace
ba000fd6ae
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-25 09:55:57 +12:00
Brenda Wallace
c54da57b31
Merge branch 'dev' into upgrade/bootstrap
2019-05-24 23:05:36 +12:00
Brenda Wallace
3ad36c647b
seed form
2019-05-24 21:15:45 +12:00
Brenda Wallace
5c544e3026
smaller planting cards
2019-05-24 21:15:36 +12:00
Brenda Wallace
b07f5526f1
Vertical buttons
2019-05-24 20:50:17 +12:00
Brenda Wallace
3ec0294565
post body
2019-05-24 20:47:18 +12:00
Brenda Wallace
95ed451c21
post header
2019-05-24 20:46:54 +12:00
Brenda Wallace
334037ed1e
form tidy
2019-05-24 20:43:00 +12:00
Brenda Wallace
ca17e6a258
Starting to tidy the crops form
2019-05-24 20:37:56 +12:00
Brenda Wallace
e4a375de79
Add missing translations
2019-05-24 20:37:32 +12:00
Brenda Wallace
f711b7e3b7
Add crops new to the percy specs
2019-05-24 20:37:16 +12:00
Brenda Wallace
c67adc1bd0
move global actions buttons
2019-05-24 20:37:06 +12:00
Brenda Wallace
cb5c28f0a3
seeds forms
2019-05-24 20:36:57 +12:00
Brenda Wallace
a2738aa99e
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-24 20:15:11 +12:00
Brenda Wallace
a18f0f4d38
rubocop lint
2019-05-24 20:15:01 +12:00
Brenda Wallace
b4b1a97a2a
Tidy harvest#index
2019-05-24 20:14:47 +12:00
Brenda Wallace
20fbec96d4
Tidying up forms
2019-05-24 20:14:24 +12:00
codefactor-io
6e78c678d7
[CodeFactor] Apply fixes
2019-05-24 01:24:29 +00:00
Brenda Wallace
c3ebdcb782
Merge pull request #1967 from Growstuff/dev-cf-autofix
...
Apply fixes from CodeFactor
2019-05-24 13:24:09 +12:00
codefactor-io
b55e99a05e
[CodeFactor] Apply fixes
2019-05-24 01:23:32 +00:00
codefactor-io
9fd2f34bf7
[CodeFactor] Apply fixes
2019-05-23 11:30:10 +00:00
Brenda Wallace
64c3d0ec3e
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-23 22:55:00 +12:00
Brenda Wallace
2f4a3fdcee
tidy up seeds form
2019-05-23 22:54:38 +12:00
Brenda Wallace
a43b2858d4
harvest form tidy up
2019-05-23 22:44:18 +12:00
Brenda Wallace
753814eb1d
Merge branch 'dev' into upgrade/bootstrap
2019-05-23 20:19:38 +12:00
dependabot[bot]
8c3c554e7f
Bump selenium-webdriver from 3.142.2 to 3.142.3
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.2 to 3.142.3.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-23 08:18:59 +00:00
Brenda Wallace
42c9879569
Merge pull request #1961 from Growstuff/dev
...
Production release
2019-05-23 11:41:09 +12:00
dependabot[bot]
d155f92206
Bump haml-rails from 2.0.0 to 2.0.1
...
Bumps [haml-rails](https://github.com/indirect/haml-rails ) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/indirect/haml-rails/releases )
- [Commits](https://github.com/indirect/haml-rails/compare/v2.0.0...v2.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-22 20:43:02 +00:00
dependabot[bot]
2a60435825
Bump rubocop from 0.69.0 to 0.70.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.69.0 to 0.70.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.69.0...v0.70.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-23 08:06:45 +12:00
Brenda Wallace
6216601d2a
Tidy up plantings#new
2019-05-22 16:53:14 +12:00
Brenda Wallace
8e23f25ebb
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
Gemfile.lock
2019-05-22 07:51:12 +12:00
Brenda Wallace
7cb0002b37
Convert to scss
2019-05-21 14:04:23 +12:00
Brenda Wallace
a8f1740584
Re-instate the buttons
2019-05-21 13:39:56 +12:00
Brenda Wallace
c421eaaf4b
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-21 13:38:06 +12:00
Brenda Wallace
3559780fb4
Plant something button
2019-05-21 13:37:43 +12:00
Brenda Wallace
d2e0331539
DRY the photos icon use
2019-05-21 13:37:31 +12:00
Brenda Wallace
bd897efcce
Addprogress back to plantings
2019-05-21 12:06:52 +12:00
Brenda Wallace
d217282bf3
Add photos to activity
2019-05-21 12:06:22 +12:00
Brenda Wallace
eb5195e80a
Merge branch 'dev' into upgrade/bootstrap
2019-05-21 11:16:03 +12:00
dependabot[bot]
c5c1bec5fb
Bump jsonapi-resources from 0.9.6 to 0.9.7
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.6 to 0.9.7.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.6...v0.9.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-20 09:00:30 +00:00
dependabot[bot]
0e359bb3f1
Bump haml_lint from 0.30.0 to 0.31.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.30.0 to 0.31.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.30.0...v0.31.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-19 20:02:19 +00:00
codefactor-io
0d9d7efbe7
[CodeFactor] Apply fixes
2019-05-19 08:35:36 +00:00
Brenda Wallace
9adca482d6
member in percy spec located
2019-05-19 20:34:46 +12:00
Brenda Wallace
8a2e5f1f54
Fix percy spec
2019-05-19 18:07:05 +12:00
Brenda Wallace
2e5445da3e
Create some activity on the member's page
2019-05-19 15:46:42 +12:00
Brenda Wallace
5f1d65dfc0
typo. tradeable -> tradable
2019-05-19 15:36:45 +12:00
Brenda Wallace
47e9f38cce
Move badges on planting thumbnail
2019-05-19 15:35:14 +12:00
Brenda Wallace
f293661bbe
seeds tidy up
2019-05-19 15:34:51 +12:00
Brenda Wallace
4de9b2f558
fix bug in percy spec
2019-05-19 15:34:37 +12:00
Brenda Wallace
dea6f36b0e
Fix filter posts by member
2019-05-19 15:34:26 +12:00
Brenda Wallace
7528a337cf
Seeds to be in percy specs
2019-05-19 15:10:31 +12:00
Brenda Wallace
4a78a30779
Put membet activity on their profile
2019-05-19 15:10:03 +12:00
Brenda Wallace
6c3278ee38
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-19 13:46:42 +12:00
Brenda Wallace
57cd11e2ab
tidy up members#show
2019-05-19 11:52:35 +12:00
Brenda Wallace
e0e54d7c07
pull-right becomes text-right
2019-05-19 11:52:08 +12:00
Brenda Wallace
d9a1323234
Tidy up gardens#show
2019-05-19 11:51:53 +12:00
Brenda Wallace
1855d1318b
pull-right becomes text-right
2019-05-19 11:50:40 +12:00
Brenda Wallace
586cdef0ed
Tidy up comments display
2019-05-19 11:50:28 +12:00
Brenda Wallace
13419d37bb
pull-right becomes text-right
2019-05-19 11:50:04 +12:00
Brenda Wallace
dcfe49901e
Posts actions in dropdown menus
2019-05-19 10:20:35 +12:00
codefactor-io
4af8282a44
[CodeFactor] Apply fixes
2019-05-18 19:36:26 +00:00
Brenda Wallace
64b3ab25e1
tidy up plantings#index
2019-05-18 23:18:42 +12:00
Brenda Wallace
dccbf440cb
Breadcrumbs
2019-05-18 23:18:27 +12:00
Brenda Wallace
b19bef0ec3
Adding posts and comments to percy spec
2019-05-18 22:29:49 +12:00
Brenda Wallace
5982a58851
Fix posts#index
2019-05-18 22:26:50 +12:00
Brenda Wallace
7bf2d75605
More post content in percy specs
2019-05-18 21:45:31 +12:00
Brenda Wallace
253d1806ef
Fix the admin menu
2019-05-18 21:42:26 +12:00
Brenda Wallace
b19586dd1d
six harvests/plantings on the homepage
2019-05-18 21:42:12 +12:00
Brenda Wallace
f019969240
Tidy up posts
2019-05-18 21:41:41 +12:00
Brenda Wallace
2046d73330
Tidy up posts#index
2019-05-18 21:12:36 +12:00
Brenda Wallace
77c0dea122
Tidy up posts#show
2019-05-18 20:14:25 +12:00
Brenda Wallace
72479eb44f
Another gardens#show test
2019-05-17 12:26:50 +12:00
Brenda Wallace
d4eaacf11e
Add menus to percy spec
2019-05-17 12:18:48 +12:00
Brenda Wallace
a21366a098
fix icons on header nav
2019-05-17 12:18:36 +12:00
Brenda Wallace
707dc2e156
Fix display of member menu
2019-05-17 11:54:49 +12:00
Brenda Wallace
0b9a0609bc
Pretty shadows on photos
2019-05-17 11:54:39 +12:00
Brenda Wallace
83be516918
Align crop photos better
2019-05-17 11:54:12 +12:00
Brenda Wallace
d55af1b77d
Fix droppdown/dropup menus
2019-05-17 11:53:32 +12:00
Brenda Wallace
8d451b9687
Only show tradeable badge is actually tradeable
2019-05-17 11:06:29 +12:00
Brenda Wallace
c5c7376759
Tidy up the small screen display of harvest and plantings on the homepage
2019-05-17 10:09:29 +12:00
Brenda Wallace
42764602ff
Use flex instead of isotope
2019-05-17 09:50:25 +12:00
Brenda Wallace
4c0bca4b86
Removing isotope
...
we don't need it anymore
2019-05-17 09:49:57 +12:00
Brenda Wallace
e21e5d5960
Fixed padding on photos#show
2019-05-16 22:18:56 +12:00
Brenda Wallace
758bfacb4f
Restore title on photos#show page
2019-05-16 22:16:58 +12:00
Brenda Wallace
a65d2ba7b5
Addings gardens#show to percy spec
2019-05-16 21:57:12 +12:00
Brenda Wallace
3deb01d983
Reduce max width
2019-05-16 21:53:55 +12:00
Brenda Wallace
2cfcfffccc
tidy up sciname display on crops#show
2019-05-16 21:53:46 +12:00
Brenda Wallace
c999715ab0
Restoring the nav bar
2019-05-16 21:53:27 +12:00
Brenda Wallace
e26fff6d23
Add icon to find seeds
2019-05-16 21:50:03 +12:00
Brenda Wallace
b0de475cbe
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-16 19:58:52 +12:00
Brenda Wallace
599cc349b8
Home page tidy for plantings, harvests, and discussion
2019-05-16 19:58:37 +12:00
Brenda Wallace
5a804db769
Merge branch 'dev' into upgrade/bootstrap
2019-05-15 12:57:07 +12:00
Brenda Wallace
89ad44e5da
Coloured button
2019-05-15 11:25:59 +12:00
Brenda Wallace
2ef7c7df19
tidy more crops#show
2019-05-15 11:25:39 +12:00
Brenda Wallace
0ee13c3320
Tidy up posts on crops#show
2019-05-15 09:32:27 +12:00
Brenda Wallace
569e2bb9a3
tidy up crops#show
2019-05-15 08:46:37 +12:00
Brenda Wallace
2165dc4e17
Tidy
2019-05-14 21:13:06 +12:00
Brenda Wallace
b5c88d8f33
set plant part in percy spec
2019-05-14 21:08:23 +12:00
Brenda Wallace
e9013a57dd
more
2019-05-14 21:00:34 +12:00
Brenda Wallace
b7ac04fc45
Restory homepage text
2019-05-14 20:36:49 +12:00
Brenda Wallace
8db6d06283
Restoring colours
2019-05-14 20:36:20 +12:00
dependabot[bot]
e54b92e306
Bump rubocop from 0.68.1 to 0.69.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.1 to 0.69.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.68.1...v0.69.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-14 08:33:52 +00:00
dependabot[bot]
d25091eead
Bump selenium-webdriver from 3.142.0 to 3.142.2
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.0 to 3.142.2.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-14 08:17:26 +00:00
dependabot[bot]
ee6fee5299
Bump rubocop-rspec from 1.32.0 to 1.33.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.32.0 to 1.33.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.32.0...v1.33.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-14 08:04:16 +00:00
dependabot[bot]
003df985af
Bump capybara from 3.19.0 to 3.19.1
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.19.0 to 3.19.1.
- [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.19.0...3.19.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-13 10:06:41 +00:00
Brenda Wallace
e029425785
Lint
2019-05-13 07:58:05 +12:00
codefactor-io
69531f232d
[CodeFactor] Apply fixes
2019-05-12 19:56:07 +00:00
Brenda Wallace
f47b22505c
Comment out global actions until it is prettier
2019-05-13 07:53:08 +12:00
Brenda Wallace
ddaa4319ec
Fix time freezer for percy specs
2019-05-13 07:52:52 +12:00
Brenda Wallace
f5d48d1b56
Removing bootstrap 3 - only bootstrap 4
...
because both isn't particularly clever
2019-05-13 07:52:38 +12:00
dependabot[bot]
9357f7a30c
Bump capybara from 3.18.0 to 3.19.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.18.0 to 3.19.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.18.0...3.19.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
d5a60c4a8f
Bump unicorn from 5.5.0 to 5.5.1
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.5.0 to 5.5.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
5fdbf3c4ac
Bump haml_lint from 0.29.0 to 0.30.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.29.0 to 0.30.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.29.0...v0.30.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
9cb6f03206
Bump selenium-webdriver from 3.141.0 to 3.142.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.141.0 to 3.142.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
80b0133f58
Bump haml_lint from 0.28.0 to 0.29.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.28.0 to 0.29.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.28.0...v0.29.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
8f796271f7
Bump newrelic_rpm from 6.2.0.354 to 6.3.0.355
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.2.0.354 to 6.3.0.355.
- [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.2.0.354...6.3.0.355 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
ca12d6be4d
Bump rubocop from 0.68.0 to 0.68.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.0 to 0.68.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.68.0...v0.68.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
Awesome Code
fa49dfc9e7
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-05-12 22:29:35 +12:00
dependabot[bot]
9b2f3fbcb4
Bump rubocop from 0.67.2 to 0.68.0
...
Bumps rubocop from 0.67.2 to 0.68.0.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
7d313fef5d
Bump paranoia from 2.4.1 to 2.4.2
...
Bumps [paranoia](https://github.com/rubysherpas/paranoia ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubysherpas/paranoia/releases )
- [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md )
- [Commits](https://github.com/rubysherpas/paranoia/compare/v2.4.1...v2.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
Brenda Wallace
51d0ac1052
adding mdbootstrap
2019-05-12 22:29:35 +12:00
dependabot[bot]
78903b4a40
Bump bullet from 5.9.0 to 6.0.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.9.0 to 6.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.9.0...6.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
Brenda Wallace
43384a18f7
Add percy to travis
2019-05-12 22:29:35 +12:00
dependabot[bot]
8f3799f0eb
Bump coffee-rails from 4.2.2 to 5.0.0
...
Bumps [coffee-rails](https://github.com/rails/coffee-rails ) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/rails/coffee-rails/releases )
- [Changelog](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/coffee-rails/compare/v4.2.2...v5.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
611710b758
Bump sidekiq from 5.2.6 to 5.2.7
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.6 to 5.2.7.
- [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/v5.2.6...v5.2.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
8ce120011f
Bump capybara from 3.17.0 to 3.18.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.17.0 to 3.18.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.17.0...3.18.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
Brenda Wallace
ef94b3d1a4
Removed irc link
2019-05-12 22:29:35 +12:00
Brenda Wallace
61b3c7880c
Freeze time
2019-05-12 22:29:35 +12:00
Brenda Wallace
89fa4743b8
Create less members per run
2019-05-12 22:29:35 +12:00
Brenda Wallace
4ec9630267
signin/signup pages
2019-05-12 22:29:35 +12:00
Brenda Wallace
559ca226d5
One run self data viewing when logged in
2019-05-12 22:29:35 +12:00
Brenda Wallace
3a2662b488
Adding viewing own data
2019-05-12 22:29:35 +12:00
Brenda Wallace
75a03ab18e
Set the gravatar, so percy doesn't alert on every snapshot
2019-05-12 22:29:35 +12:00
Brenda Wallace
3ebd7ede87
Add percy
2019-05-12 22:29:35 +12:00
Brenda Wallace
4d513aaabd
Merge branch 'dev' into upgrade/bootstrap
2019-05-11 07:58:57 +12:00
dependabot[bot]
5bae18ed6e
Bump capybara from 3.18.0 to 3.19.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.18.0 to 3.19.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.18.0...3.19.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-10 07:42:15 +00:00
dependabot[bot]
9182846a93
Bump unicorn from 5.5.0 to 5.5.1
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.5.0 to 5.5.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-06 18:49:37 +00:00
Brenda Wallace
76f7a8f5d0
Merge branch 'master' into dev
2019-05-06 22:20:31 +12:00
dependabot[bot]
b7d10b2660
Bump haml_lint from 0.29.0 to 0.30.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.29.0 to 0.30.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.29.0...v0.30.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-06 22:19:18 +12:00
dependabot[bot]
43c93bcd44
Bump selenium-webdriver from 3.141.0 to 3.142.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.141.0 to 3.142.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-05 07:08:17 +12:00
dependabot[bot]
e7ade7605d
Merge pull request #1948 from Growstuff/dependabot/bundler/haml_lint-0.29.0
2019-05-04 11:33:06 +00:00
dependabot[bot]
e2010d4900
Bump haml_lint from 0.28.0 to 0.29.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.28.0 to 0.29.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.28.0...v0.29.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-03 07:39:06 +00:00
dependabot[bot]
2d3450f2a5
Bump newrelic_rpm from 6.2.0.354 to 6.3.0.355
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.2.0.354 to 6.3.0.355.
- [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.2.0.354...6.3.0.355 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-01 21:41:42 +12:00
dependabot[bot]
3360977eb4
Bump rubocop from 0.68.0 to 0.68.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.0 to 0.68.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.68.0...v0.68.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-01 20:45:11 +12:00
Awesome Code
82a35ac69b
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-04-30 11:30:34 +00:00
Brenda Wallace
8b6c3ef3fb
Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
...
Conflicts:
Gemfile.lock
2019-04-30 19:51:09 +12:00
dependabot[bot]
b77422137f
Bump rubocop from 0.67.2 to 0.68.0
...
Bumps rubocop from 0.67.2 to 0.68.0.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-30 19:49:31 +12:00
Daniel O'Connor
7353ee111d
Merge pull request #1944 from Growstuff/dependabot/bundler/paranoia-2.4.2
...
Bump paranoia from 2.4.1 to 2.4.2
2019-04-30 14:19:54 +09:30
Brenda Wallace
75f14aecc0
Crop page tidy
2019-04-30 13:15:19 +12:00
Brenda Wallace
126769bfad
Remove jquery roadmap
2019-04-30 13:14:24 +12:00
Brenda Wallace
e92f5392a1
Alphabetical gems
2019-04-30 13:11:45 +12:00
Brenda Wallace
5b9a51c770
Merge branch 'dev' into upgrade/bootstrap
2019-04-30 10:08:14 +12:00
Brenda Wallace
0c61e72f86
Use full size crop images
2019-04-29 18:36:28 +12:00
Brenda Wallace
6dbf7a7932
Fix typo
2019-04-29 18:26:07 +12:00
Brenda Wallace
0c81f962aa
homepage tidy
2019-04-29 18:16:14 +12:00
Brenda Wallace
d400e73ff6
Move global actions
2019-04-29 15:31:47 +12:00
Brenda Wallace
3cb6fb90f7
Fix crop display
2019-04-29 15:31:39 +12:00
Brenda Wallace
d039c68f8a
Tidy up crops#index on mobile
2019-04-27 20:49:17 +12:00
Brenda Wallace
9ecf210ffb
More form tidy up
2019-04-27 19:19:42 +12:00
Brenda Wallace
45745a4e38
Add crops#new to percy
2019-04-27 19:11:59 +12:00
Brenda Wallace
945d320a0a
Remove the title from every page - because sometimes we don't want it
2019-04-27 19:11:49 +12:00
Brenda Wallace
eabf1fc659
Tidy up (most) forms
2019-04-27 19:11:30 +12:00
Brenda Wallace
430334a831
More photo specs for percy
2019-04-27 16:46:11 +12:00
Brenda Wallace
25626ea0ec
Added #edit to percy
2019-04-27 09:53:59 +12:00
Brenda Wallace
f2a840a1de
Fix spec
2019-04-26 22:09:17 +12:00
Brenda Wallace
83038fc4f3
More rounded photos
2019-04-26 22:03:56 +12:00
Brenda Wallace
9524899f78
tidy up harvests #index
2019-04-26 22:03:49 +12:00
Brenda Wallace
2db8dcf7c1
Pretty rounded images
2019-04-26 22:03:30 +12:00
Brenda Wallace
31bcb35fb4
Don't turn crop images into circles
2019-04-26 22:03:20 +12:00
Brenda Wallace
f96b2ca661
Tidy columns on crops index card
2019-04-26 21:41:30 +12:00
Brenda Wallace
548e15a866
Tidy up Photos#show
2019-04-26 21:38:34 +12:00
Brenda Wallace
83668c4890
Add photos#show to percy
2019-04-26 21:30:09 +12:00
Brenda Wallace
7c51d94dc0
More crops#show tidy up
2019-04-26 21:27:46 +12:00
Brenda Wallace
0871620c55
Tidy up finding seeds from crops#show
2019-04-26 21:27:35 +12:00
dependabot[bot]
81a3c7bfbc
Bump paranoia from 2.4.1 to 2.4.2
...
Bumps [paranoia](https://github.com/rubysherpas/paranoia ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubysherpas/paranoia/releases )
- [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md )
- [Commits](https://github.com/rubysherpas/paranoia/compare/v2.4.1...v2.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-26 07:33:13 +00:00
Brenda Wallace
6d8a9c3579
Move global actions
2019-04-26 17:54:52 +12:00
Brenda Wallace
4196ce9e6b
Fix search
2019-04-26 17:35:22 +12:00
Brenda Wallace
b82c3b5b76
Tidy up seeds
2019-04-26 17:34:55 +12:00
Brenda Wallace
30b4485727
adding mdbootstrap
2019-04-26 16:36:54 +12:00
Brenda Wallace
de3aeaf823
add base branch to percy
2019-04-26 16:34:04 +12:00
Brenda Wallace
662160306d
add #new to percy tests
2019-04-26 16:34:00 +12:00
Brenda Wallace
088dd29fac
Add an avatar to all members
2019-04-26 16:26:22 +12:00
dependabot[bot]
7bb1424f0c
Bump bullet from 5.9.0 to 6.0.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.9.0 to 6.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.9.0...6.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-26 00:45:04 +12:00
Brenda Wallace
71cf334e03
Add back the link to crop seeds
2019-04-26 00:18:04 +12:00
Brenda Wallace
b9ae3a4ab4
Add harvests to the homepage in percy specs
2019-04-26 00:01:54 +12:00
Brenda Wallace
cf3477e333
Use full size image
2019-04-26 00:01:38 +12:00
Brenda Wallace
d5d9c805ad
Shadows on the homepage
2019-04-25 23:51:53 +12:00
Brenda Wallace
3316514a7a
More material bits
2019-04-25 23:41:34 +12:00
Brenda Wallace
bff809f482
Removed extra graphs on crops#show
2019-04-25 23:33:49 +12:00
Brenda Wallace
4918d0c950
Tidy up homepage
2019-04-25 23:28:41 +12:00
Brenda Wallace
7dd3f169ee
Fixed haml error
2019-04-25 12:49:23 +12:00
Brenda Wallace
ab7eb913de
removed git conflict marker
2019-04-25 12:47:24 +12:00
Brenda Wallace
5534438843
Add percy to travis
2019-04-25 12:45:44 +12:00
Brenda Wallace
724adcb183
Merge remote-tracking branch 'upstream/dev' into material-merge
2019-04-25 12:36:12 +12:00
Brenda Wallace
5ad741ad7b
Merge remote-tracking branch 'upstream/dev' into material-merge
...
Conflicts:
app/views/members/_avatar.html.haml
2019-04-25 12:36:01 +12:00
dependabot[bot]
bba9e43b77
Bump coffee-rails from 4.2.2 to 5.0.0
...
Bumps [coffee-rails](https://github.com/rails/coffee-rails ) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/rails/coffee-rails/releases )
- [Changelog](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/coffee-rails/compare/v4.2.2...v5.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-24 22:37:30 +12:00
dependabot[bot]
9c7564c3b2
Bump sidekiq from 5.2.6 to 5.2.7
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.6 to 5.2.7.
- [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/v5.2.6...v5.2.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-24 20:10:12 +12:00
dependabot[bot]
45fd123525
Merge pull request #1938 from Growstuff/dependabot/bundler/capybara-3.18.0
2019-04-24 06:57:20 +00:00
dependabot[bot]
bc33bf3084
Bump capybara from 3.17.0 to 3.18.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.17.0 to 3.18.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.17.0...3.18.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-24 01:36:20 +00:00
Brenda Wallace
85e7454d16
Removed irc link
2019-04-24 12:07:41 +12:00
pozorvlak
242059adf8
Merge pull request #1937 from Br3nda/percy
...
Add percy - visual difference detection
2019-04-23 17:34:37 +01:00
Brenda Wallace
3c53a8464d
Freeze time
2019-04-23 13:47:36 +12:00
Brenda Wallace
09db299416
Create less members per run
2019-04-23 13:12:13 +12:00
Brenda Wallace
c3d52e0b71
signin/signup pages
2019-04-23 13:04:24 +12:00
Brenda Wallace
21ba03fc7f
One run self data viewing when logged in
2019-04-23 10:52:27 +12:00
Brenda Wallace
e9cbda13b3
Adding viewing own data
2019-04-23 10:44:36 +12:00
Brenda Wallace
03acf35e73
Set the gravatar, so percy doesn't alert on every snapshot
2019-04-23 10:32:01 +12:00
Brenda Wallace
ba62208dd1
Add percy
2019-04-23 10:21:07 +12:00
dependabot[bot]
2b4d0fecf4
[Security] Bump nokogiri from 1.10.2 to 1.10.3
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-23 08:47:13 +12:00
Brenda Wallace
f7e1cb6508
Merge pull request #1934 from Growstuff/dependabot/bundler/nokogiri-1.10.3
...
[Security] Bump nokogiri from 1.10.2 to 1.10.3
2019-04-23 08:44:44 +12:00
dependabot[bot]
eb428e7741
[Security] Bump nokogiri from 1.10.2 to 1.10.3
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-22 18:06:31 +00:00
Brenda Wallace
0491820a35
Only show planted_at if it is set
2019-04-21 22:31:54 +12:00
Brenda Wallace
e327e6fd11
Merge pull request #1918 from Growstuff/dev
...
Release 51
2019-04-21 22:00:39 +12:00
Brenda Wallace
64877fe2ac
more tidy up of password reset form
2019-04-21 19:07:33 +12:00
Brenda Wallace
9dfe4d5b2d
More form tidy up
2019-04-21 15:24:45 +12:00
Brenda Wallace
ee03b57d89
Tidy up sign up form
2019-04-21 15:04:35 +12:00
Brenda Wallace
e6e50a3a42
Turn the plantings facts into cards with drop shadow
2019-04-21 14:02:04 +12:00
Brenda Wallace
730c2b79f7
Tidy up forgot password page
2019-04-21 14:01:45 +12:00
Brenda Wallace
ba3ee3a9f0
Tidy up login form
2019-04-21 13:55:45 +12:00
Brenda Wallace
f5f5ecdea7
Merge remote-tracking branch 'upstream/dev' into material-merge
...
Conflicts:
Gemfile.lock
app/assets/javascripts/application.js
app/assets/stylesheets/application.sass
app/assets/stylesheets/plantings.sass
app/views/crops/_thumbnail.html.haml
app/views/crops/show.html.haml
app/views/home/_members.html.haml
app/views/layouts/application.html.haml
app/views/photos/show.html.haml
app/views/plantings/_descendants.html.haml
app/views/plantings/show.html.haml
app/views/seeds/_thumbnail.html.haml
app/views/shared/_global_actions.html.haml
spec/models/crop_spec.rb
2019-04-21 11:27:27 +12:00
Awesome Code
78c8fdb743
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-04-20 09:44:42 +00:00
Awesome Code
4e07b0d620
Auto corrected by following Lint Ruby RSpec/LeadingSubject
2019-04-20 09:42:28 +00:00
Brenda Wallace
7b56c7a6ab
Merge branch 'dev' into UTFGardenNames
2019-04-20 20:17:52 +12:00
Brenda Wallace
5480fbb427
Merge pull request #1927 from Br3nda/reindex-rake
...
Reindex in batches
2019-04-20 20:16:49 +12:00
Brenda Wallace
1ebaf88092
Merge pull request #1889 from Br3nda/plantings-show
...
Remove table display on plantings#show, replace with boxes
2019-04-20 20:16:13 +12:00
Brenda Wallace
4312ef0047
FIX typo in view
2019-04-20 20:07:19 +12:00
Brenda Wallace
9ee3f514cd
Adding trailing comma
...
because codeclimate likes them
2019-04-20 20:01:34 +12:00
Brenda Wallace
3371353db8
Revert spec
...
less to update
2019-04-20 19:57:45 +12:00
Brenda Wallace
a2f9f2f6df
Replace (revert back) to simple image_tag in photos#show
...
so i don't need to update specs
2019-04-20 19:56:23 +12:00
Brenda Wallace
10a7689b05
Lint
2019-04-20 19:30:09 +12:00
Brenda Wallace
e2f3723777
Remove
2019-04-20 15:14:43 +12:00
Brenda Wallace
fa9205a94e
Remove ooops icons
2019-04-20 15:12:07 +12:00
Brenda Wallace
f86177e78f
lint
2019-04-20 15:10:08 +12:00
Brenda Wallace
33460bb171
Update spec
2019-04-20 15:09:24 +12:00
Brenda Wallace
e41bc6c6f1
8 members
2019-04-20 15:06:59 +12:00
Brenda Wallace
9c01ef94ac
Revert to previous code
...
So i don't need to update lotsa specs
2019-04-20 15:05:03 +12:00
Brenda Wallace
bf4c8a83e1
Update some planting show specs
2019-04-20 14:31:02 +12:00
Brenda Wallace
3e91d3e982
Merge branch 'dev' into plantings-show
2019-04-20 14:13:45 +12:00
dependabot[bot]
4842d31ea6
Merge pull request #1930 from Growstuff/dependabot/bundler/capybara-3.17.0
2019-04-20 01:33:14 +00:00
Brenda Wallace
570c53318d
Consistently using h3
2019-04-20 13:25:47 +12:00
Brenda Wallace
bf2bc6302a
Merge remote-tracking branch 'origin/plantings-show' into plantings-show
2019-04-20 13:22:21 +12:00
Brenda Wallace
b9267336b4
Merge branch 'dev' into plantings-show
2019-04-20 13:22:18 +12:00
Brenda Wallace
5484664716
Update spec
2019-04-20 12:16:58 +12:00
dependabot[bot]
41cee3b416
Bump capybara from 3.16.2 to 3.17.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.2 to 3.17.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.16.2...3.17.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-20 00:13:35 +00:00
dependabot[bot]
7b08ad6091
Merge pull request #1929 from Growstuff/dependabot/bundler/oj-3.7.12
2019-04-20 00:12:09 +00:00
Brenda Wallace
7c113f0e1c
Back to using thumbnails
2019-04-20 10:01:18 +12:00
Brenda Wallace
e899634696
lint
2019-04-20 09:54:21 +12:00
Brenda Wallace
7ea13c40ed
Isotope not needed for photo thumbnails
2019-04-20 09:54:02 +12:00
Brenda Wallace
01beb6ac7e
Merge remote-tracking branch 'origin/plantings-show' into plantings-show
2019-04-20 09:47:32 +12:00
Brenda Wallace
54146a3a9f
javascript lint
2019-04-20 09:47:19 +12:00
Brenda Wallace
9da4ccd6de
Merge branch 'dev' into plantings-show
2019-04-20 09:46:14 +12:00
dependabot[bot]
63788e4844
Bump oj from 3.7.11 to 3.7.12
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.11 to 3.7.12.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-19 21:45:27 +00:00
Brenda Wallace
91b7f58e9d
No longer have 100% on plantings that are finished
2019-04-20 09:45:06 +12:00
Brenda Wallace
a8009c49e8
Merge pull request #1931 from Growstuff/dependabot/bundler/searchkick-4.0.0
...
Bump searchkick from 3.1.2 to 4.0.0
2019-04-20 09:43:57 +12:00
Brenda Wallace
b71df87ac3
better use of fullsize crop image
2019-04-20 09:40:31 +12:00
Brenda Wallace
03bdb45b2d
Higher res photo, so it doesn't look pixelated
2019-04-20 09:36:18 +12:00
Brenda Wallace
94a2127c04
Tidy up small screen display
2019-04-20 09:35:59 +12:00
Brenda Wallace
837111f6dc
Checks we have a planted_from before we pluralize it
2019-04-20 09:27:07 +12:00
Brenda Wallace
c66ee04690
Only suggest recording harvests if they planting isn't finished
2019-04-20 09:19:13 +12:00
Brenda Wallace
31c628e950
Put back our own progress bar
2019-04-20 09:18:52 +12:00
Brenda Wallace
27d12bf07e
Isotope making nice layout on plantings#show
2019-04-20 09:09:07 +12:00
Brenda Wallace
89b4b3bee0
Use fas icons everywhere
2019-04-20 09:06:21 +12:00
Brenda Wallace
d4b487846d
Fixed space in image name
2019-04-20 07:27:06 +12:00
Brenda Wallace
4c0c9047f9
Merge branch 'dev' into reindex-rake
2019-04-19 20:50:32 +12:00
dependabot[bot]
b221b13856
Bump searchkick from 3.1.2 to 4.0.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 3.1.2 to 4.0.0.
- [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/v3.1.2...v4.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-19 07:22:15 +00:00
Brenda Wallace
1eea251f95
Merge branch 'dev' into plantings-show
2019-04-19 10:39:26 +12:00
Brenda Wallace
1ad88c91f4
Merge pull request #1858 from Br3nda/feature/memcachier
...
Remove staging file and re-instate memcachier
2019-04-19 10:37:56 +12:00
Brenda Wallace
d7e3d2e9db
Reindex in batches
2019-04-19 10:10:35 +12:00
Brenda Wallace
e81e4146e7
Merge remote-tracking branch 'origin/feature/memcachier' into feature/memcachier
2019-04-19 09:31:24 +12:00
Brenda Wallace
f60174a8b9
Merge remote-tracking branch 'upstream/dev' into feature/memcachier
2019-04-19 09:30:48 +12:00
Brenda Wallace
5908d9f9dd
Merge pull request #1901 from Br3nda/feature/searchkick
...
Swap elasticsearch gem for searchkick
2019-04-19 09:26:48 +12:00
Brenda Wallace
eb46b8113f
Merge remote-tracking branch 'upstream/dev' into plantings-show
2019-04-19 09:16:32 +12:00
Brenda Wallace
32a88b4482
Merge remote-tracking branch 'origin/plantings-show' into plantings-show
2019-04-19 09:16:01 +12:00
Brenda Wallace
a2e2362594
Linter fix ups
2019-04-19 09:15:41 +12:00
Brenda Wallace
6af61d0e86
Add someone else's plantings, to ensure test is valid
2019-04-19 09:11:56 +12:00
Brenda Wallace
909ce99ab8
Merge remote-tracking branch 'origin/feature/searchkick' into feature/searchkick
2019-04-19 09:06:55 +12:00
Brenda Wallace
3829db6bc2
Specs for biasing results from elastic search
2019-04-19 09:05:53 +12:00
pozorvlak
b3385663e8
Fix spelling of portobello
...
Co-Authored-By: Br3nda <brenda@wallace.net.nz >
2019-04-19 08:47:08 +12:00
Brenda Wallace
453242d04e
Merge remote-tracking branch 'upstream/dev' into feature/searchkick
2019-04-19 08:43:28 +12:00
Brenda Wallace
10006599eb
Merge branch 'dev' into feature/memcachier
2019-04-19 08:36:40 +12:00
pozorvlak
d7497e4342
Fixed comment
...
Co-Authored-By: Br3nda <brenda@wallace.net.nz >
2019-04-19 08:32:38 +12:00
Daniel O'Connor
1df411f162
Merge pull request #1926 from Growstuff/dependabot/bundler/selenium-webdriver-3.141.5926
...
Bump selenium-webdriver from 3.141.0 to 3.141.5926
2019-04-18 17:38:53 +09:30
Daniel O'Connor
8a14a7bc0d
Merge branch 'dev' into plantings-show
2019-04-18 17:33:30 +09:30
dependabot[bot]
fcd7ad8ed6
Bump selenium-webdriver from 3.141.0 to 3.141.5926
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.141.0 to 3.141.5926.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-18 07:20:57 +00:00
Brenda Wallace
85ba701045
Merge branch 'dev' into feature/searchkick
2019-04-17 12:35:09 +12:00
Brenda Wallace
3868201c73
Merge branch 'dev' into feature/memcachier
2019-04-17 10:38:10 +12:00
Awesome Code
8b0ecd568e
Auto corrected by following Lint Ruby RSpec/ImplicitSubject
2019-04-17 10:37:30 +12:00
Awesome Code
d0001691d5
Auto corrected by following Lint Ruby EmptyLine
2019-04-16 22:02:27 +12:00
Awesome Code
a4e398bb62
Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace
2019-04-16 09:55:51 +00:00
dependabot[bot]
deef508b9c
Bump cancancan from 3.0.0 to 3.0.1
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.0.0...3.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-16 20:43:16 +12:00
dependabot[bot]
b9a7c24da6
Bump sidekiq from 5.2.5 to 5.2.6
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.5 to 5.2.6.
- [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/v5.2.5...v5.2.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-15 20:31:42 +12:00
Awesome Code
b9ca89b336
Auto corrected by following Lint Ruby RSpec/LetBeforeExamples
2019-04-14 19:38:16 +00:00
Awesome Code
ff3ea5c52f
Auto corrected by following Lint Ruby RSpec/HookArgument
2019-04-14 18:38:06 +00:00
Awesome Code
b84b1e89c1
Auto corrected by following Lint Ruby RSpec/ExampleWording
2019-04-14 18:37:52 +00:00
Awesome Code
e54c13afe3
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-04-14 18:36:34 +00:00
Awesome Code
50a2de3709
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-04-14 10:01:46 +00:00
Brenda Wallace
0ae33d9b03
Merge branch 'dev' into plantings-show
2019-04-13 21:02:56 +12:00
Brenda Wallace
9ed955d94c
Merge branch 'dev' into feature/searchkick
2019-04-13 13:09:31 +12:00
dependabot[bot]
5a8404e356
Bump leaflet-rails from 1.3.1 to 1.4.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Changelog](https://github.com/axyjo/leaflet-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.3.1...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-13 13:08:59 +12:00
Brenda Wallace
9a17df1786
Merge branch 'dev' into feature/searchkick
2019-04-13 12:14:07 +12:00
Brenda Wallace
331a5c9a99
Merge branch 'master' into dev
2019-04-13 12:13:44 +12:00
dependabot[bot]
fb133b97b0
Bump capybara from 3.16.1 to 3.16.2 ( #1915 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.1 to 3.16.2.
- [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.16.1...3.16.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-13 12:12:35 +12:00
Brenda Wallace
b733a91064
Merge branch 'dev' into feature/searchkick
2019-04-13 12:10:40 +12:00
Brenda Wallace
cb680a5a0e
Auto corrected by following Lint Ruby Space ( #1917 )
2019-04-13 12:09:47 +12:00
Brenda Wallace
12d5632b63
Merge branch 'dev' into feature/searchkick
2019-04-13 12:06:37 +12:00
Brenda Wallace
3e01da0036
Remove waffle link, replace with github projects ( #1916 )
2019-04-13 12:05:58 +12:00
Brenda Wallace
e322c863b2
Removed unused arg to dbsearch
2019-04-13 10:20:33 +12:00
Brenda Wallace
e34a2d609b
Plurals spec only when we have elastic search
2019-04-13 10:17:21 +12:00
Brenda Wallace
174f54cb75
Linting
2019-04-13 10:13:36 +12:00
Brenda Wallace
0a0cd24e2a
Removed extra reindex
2019-04-13 10:06:44 +12:00
Brenda Wallace
347d751935
More plurals and misspellings in search specs
2019-04-13 10:03:18 +12:00
Brenda Wallace
026efe5d15
Rubocop lint
2019-04-13 09:50:49 +12:00
Brenda Wallace
fa1913c8b6
Split a method to reduce the complexity
2019-04-13 09:50:36 +12:00
Brenda Wallace
3ecb81300a
Re-index before we use autocomplete
...
so elastic search is in sync
2019-04-13 09:42:13 +12:00
Brenda Wallace
526450f0eb
Added search controller specs
2019-04-13 09:42:13 +12:00
Brenda Wallace
9683983f23
Merge branch 'dev' into feature/searchkick
2019-04-10 20:02:35 +12:00
Brenda Wallace
7ac410c499
varieties info on crops#show ( #1848 )
...
* Tests for crop.photos
* More info on a crop's varieties, and parent
* Update spec for new crop varieties display
* Add varieties div wrapper, so test can find the area of the page
2019-04-10 20:02:05 +12:00
Brenda Wallace
bd1a1c53f4
Removed unneeded rubocop disable
2019-04-08 21:59:44 +12:00
Brenda Wallace
ccb69c5f7d
Style/lint tidy up models
2019-04-08 21:59:26 +12:00
Brenda Wallace
e165c77d64
Force autocomplete to json format
2019-04-08 21:39:20 +12:00
Brenda Wallace
74e6a7cf2f
Rename @matches to @crops
2019-04-08 21:39:20 +12:00
Brenda Wallace
5b35e3fe95
remove an unnecesary index
2019-04-08 21:39:20 +12:00
Brenda Wallace
55e89e95fe
Fix a deprecation warning
2019-04-08 21:39:20 +12:00
Brenda Wallace
302e19776f
code style fix up
2019-04-08 21:39:20 +12:00
Brenda Wallace
01a3654d41
Working without elastic search too
2019-04-08 21:39:20 +12:00
Brenda Wallace
77d1fc7347
Move crop searching specs from the crop model to the crop search service
2019-04-08 21:39:20 +12:00
Brenda Wallace
ca743e421d
Add matching ES methods for when no elastic search configured
2019-04-08 21:39:20 +12:00
Brenda Wallace
f3ae1a8ec3
Fix dangerous sql warning
2019-04-08 21:39:20 +12:00
Brenda Wallace
789cffeca1
Eager loading
2019-04-08 21:39:20 +12:00
Brenda Wallace
e5c0edb0d0
Tidy up specs
2019-04-08 21:39:20 +12:00
Brenda Wallace
e465b6f19c
Elastic search spec helper
2019-04-08 21:39:20 +12:00
Brenda Wallace
150d44ad6f
named arguments for search
2019-04-08 21:39:20 +12:00
Brenda Wallace
ab57451b17
only reindex our one crop
2019-04-08 21:39:20 +12:00
Brenda Wallace
bd797a4d8e
Change call to reindex crops in specs
2019-04-08 21:39:20 +12:00
Brenda Wallace
c8716b6a1a
Add oj gem, to speed up json use
2019-04-08 21:39:20 +12:00
Brenda Wallace
370747390a
Add default pagination to crop search service
2019-04-08 21:39:20 +12:00
Brenda Wallace
61e0c2eb1d
Swap elasticssearch for searchkick
2019-04-08 21:39:20 +12:00
Brenda Wallace
ae4ad3a62a
Change to use searchkick
2019-04-08 21:39:20 +12:00
Brenda Wallace
f5c7f5e6d7
Merge pull request #1883 from Growstuff/dev
...
Production release
2019-04-08 15:07:13 +12:00
Brenda Wallace
a998a8b0f6
Update README.md
2019-04-08 14:50:29 +12:00
Brenda Wallace
ad90dd6dfa
Fixes wrong host name in emails
2019-04-08 14:23:34 +12:00
dependabot[bot]
a48acc0253
Bump rubocop from 0.66.0 to 0.67.2
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.66.0 to 0.67.2.
- [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.66.0...v0.67.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-08 14:16:02 +12:00
dependabot[bot]
7ca263aa64
Bump capybara from 3.16.0 to 3.16.1
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.0 to 3.16.1.
- [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.16.0...3.16.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-06 09:18:12 +13:00
dependabot[bot]
d8b70a927a
Bump js-routes from 1.4.5 to 1.4.6
...
Bumps [js-routes](https://github.com/railsware/js-routes ) from 1.4.5 to 1.4.6.
- [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.5...v1.4.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-05 22:41:23 +13:00
dependabot[bot]
7c6a76b41c
Bump cancancan from 2.3.0 to 3.0.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 2.3.0 to 3.0.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.3.0...3.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-05 10:14:18 +13:00
dependabot[bot]
b43b8f5868
Bump js-routes from 1.4.4 to 1.4.5
...
Bumps [js-routes](https://github.com/railsware/js-routes ) from 1.4.4 to 1.4.5.
- [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.4...v1.4.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-03 03:52:09 +13:00
Brenda Wallace
c89682792c
Merge branch 'dev' into feature/memcachier
2019-04-02 22:22:00 +13:00
Awesome Code
a2fd0f0ae2
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-04-01 10:15:18 +00:00
Brenda Wallace
6ef3b02764
Remove commented out code
2019-04-01 23:02:50 +13:00
Brenda Wallace
495002d8b9
Change "background" to "before"
2019-04-01 23:02:50 +13:00
Awesome Code
4ba5319ba8
Auto corrected by following Lint Ruby Capybara/FeatureMethods
2019-04-01 23:02:50 +13:00
dependabot[bot]
71ab33d20c
Bump i18n-tasks from 0.9.28 to 0.9.29
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.28 to 0.9.29.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.28...v0.9.29 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-01 22:26:08 +13:00
Brenda Wallace
ff22adfd76
Merge branch 'dev' into feature/memcachier
2019-03-31 10:21:27 +13:00
Brenda Wallace
a62c268dda
Merge branch 'dev' into plantings-show
2019-03-31 10:20:57 +13:00
Awesome Code
6e10dc2a2b
Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace
2019-03-31 10:20:08 +13:00
Awesome Code
4dcb420534
Auto corrected by following Lint Ruby RSpec/HookArgument
2019-03-31 10:19:51 +13:00
Awesome Code
fb243c1f8d
Auto corrected by following Lint Ruby RSpec/ExpectChange
2019-03-31 09:24:13 +13:00
Awesome Code
837ae8cb8e
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-03-30 18:09:37 +13:00
Awesome Code
f48e131e14
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-03-30 18:07:30 +13:00
Brenda Wallace
5e51c4ab9b
Merge branch 'dev' into plantings-show
2019-03-30 18:03:31 +13:00
Brenda Wallace
a58ce0f6a2
Tidy up mobile
2019-03-30 18:01:55 +13:00
Brenda Wallace
2e91a3f381
Merge branch 'dev' into feature/memcachier
2019-03-30 16:52:50 +13:00
dependabot[bot]
30b5c0ce9d
Bump capybara from 3.15.0 to 3.16.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.15.0 to 3.16.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.15.0...3.16.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-30 10:11:58 +13:00
Brenda Wallace
6cf60afec4
Don't check for markasinished on plantings#index
2019-03-29 15:49:11 +13:00
Brenda Wallace
4d95130216
Move phtos to a gallery
2019-03-29 15:48:57 +13:00
Brenda Wallace
43bb606a2b
Cleaning up small screen presentation
2019-03-29 15:48:47 +13:00
Brenda Wallace
830b554dc9
Test updates
2019-03-29 11:28:17 +13:00
Brenda Wallace
e4d4cdc3fa
Fix up seed description helper
2019-03-29 10:45:51 +13:00
Brenda Wallace
cb91b43d25
Fix deprecation warning
2019-03-29 10:29:05 +13:00
Brenda Wallace
bab9c01bf5
Updating tests
2019-03-29 10:25:30 +13:00
Brenda Wallace
9be4c4179f
Updating specs
2019-03-28 15:49:39 +13:00
Brenda Wallace
5722859a24
Move notes higher
2019-03-28 10:01:05 +13:00
Brenda Wallace
2bc12570c4
Consistent display of seeds/harvests
2019-03-27 22:38:28 +13:00
Brenda Wallace
0c9702e1a4
Move photo query, so we use eager loading
2019-03-27 22:28:06 +13:00
Brenda Wallace
562a7b1a10
Merge remote-tracking branch 'origin/plantings-show' into plantings-show
2019-03-27 21:19:43 +13:00
Brenda Wallace
626d5f8d7c
Move harvest and seeds to the right on plantings#show
2019-03-27 21:19:35 +13:00
Brenda Wallace
d35dfeea21
Show date taken, not data the database record was created
2019-03-27 21:19:22 +13:00
Brenda Wallace
984da54534
Merge branch 'dev' into plantings-show
2019-03-27 21:13:28 +13:00
Brenda Wallace
3ced3da682
Merge branch 'dev' into feature/memcachier
2019-03-27 21:06:23 +13:00
Brenda Wallace
9c231703ab
Merge pull request #1888 from Growstuff/dependabot/bundler/devise-4.6.2
...
Bump devise from 4.6.1 to 4.6.2
2019-03-27 21:06:00 +13:00
Brenda Wallace
e7b0b6f18e
Remove table display on plantings#show, replace with boxes
2019-03-27 21:04:56 +13:00
dependabot[bot]
2126863632
Bump devise from 4.6.1 to 4.6.2
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.1...v4.6.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-27 07:46:45 +00:00
dependabot[bot]
566308a49d
Merge pull request #1887 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.6
2019-03-26 10:00:26 +00:00
Brenda Wallace
1e0f308db2
Merge branch 'dev' into UTFGardenNames
2019-03-26 22:43:56 +13:00
Brenda Wallace
0717e0a00d
Merge branch 'dev' into feature/memcachier
2019-03-26 22:42:45 +13:00
dependabot[bot]
9222782808
Bump jsonapi-resources from 0.9.5 to 0.9.6
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.5 to 0.9.6.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.5...v0.9.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-26 09:39:24 +00:00
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
Brenda Wallace
de2fa81aae
Remove staging env from bundle
2019-03-26 15:57:30 +13:00
Brenda Wallace
8e8c9d179b
Added growstuff prefix to env variables
2019-03-26 15:57:29 +13:00
Brenda Wallace
607f0e3887
Rename to mapbox map id
2019-03-26 15:57:29 +13:00
Brenda Wallace
875fa49d44
Remove distinct staging env file
2019-03-26 15:57:29 +13:00
Brenda Wallace
ba27e14226
Move mapbox config to env
2019-03-26 15:57:29 +13:00
Brenda Wallace
59b3a68fc3
Configure memcachier for production
2019-03-26 15:57:29 +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
Awesome Code
f488e0aeb1
Auto corrected by following Lint Ruby RSpec/ExpectChange
2019-03-20 15:01:33 +13:00
dependabot[bot]
fca035e537
Bump rubocop from 0.64.0 to 0.65.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.64.0 to 0.65.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.64.0...v0.65.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
Awesome Code
5145ead93b
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-03-20 15:01:33 +13:00
Awesome Code
da997ae538
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-03-20 15:01:33 +13:00
dependabot[bot]
cbf4e0a61a
Bump faker from 1.9.2 to 1.9.3
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.2...v1.9.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
b49a59bf72
Bump haml-rails from 1.0.0 to 2.0.0
...
Bumps [haml-rails](https://github.com/indirect/haml-rails ) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/indirect/haml-rails/releases )
- [Commits](https://github.com/indirect/haml-rails/compare/v1.0.0...v2.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
ea5b622225
Bump byebug from 10.0.2 to 11.0.0
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 10.0.2 to 11.0.0.
- [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/v10.0.2...v11.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
da32a2caf1
Bump newrelic_rpm from 6.0.0.351 to 6.1.0.352
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.0.0.351 to 6.1.0.352.
- [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.0.0.351...6.1.0.352 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
9a24bb2fc3
Bump capybara from 3.13.2 to 3.14.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.13.2 to 3.14.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.13.2...3.14.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
Brenda Wallace
6cebb4041c
Merge branch 'dev' into setup/scout
2019-03-20 11:28:01 +13:00
dependabot[bot]
265e8ef59f
Bump newrelic_rpm from 6.1.0.352 to 6.2.0.354
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.1.0.352 to 6.2.0.354.
- [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.1.0.352...6.2.0.354 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-19 22:25:28 +00:00
dependabot[bot]
64ef425867
Merge pull request #1875 from Growstuff/dependabot/bundler/rubocop-0.66.0
2019-03-19 22:22:56 +00:00
dependabot[bot]
1e3a8119ba
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-19 21:51:56 +00:00
dependabot[bot]
65f19c1818
Merge pull request #1801 from Growstuff/dependabot/bundler/responders-2.4.1
2019-03-19 21:49:17 +00:00
dependabot[bot]
2b36609036
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-19 21:39:40 +00:00
Brenda Wallace
2690da260d
add scout to heroku addons
2019-03-20 10:02:21 +13:00
Brenda Wallace
19faf66767
Add the scout gem to production
2019-03-20 10:01:57 +13:00
Brenda Wallace
db5bdab055
Set planting.finished as a boolean
2019-03-20 09:43:01 +13:00
Brenda Wallace
77f936cb0f
update spec
2019-03-20 09:43:01 +13:00
Brenda Wallace
37693e8d12
Add filters for the members api
2019-03-20 09:43:01 +13:00
dependabot[bot]
8a52025f03
Merge pull request #1876 from Growstuff/dependabot/bundler/byebug-11.0.1
2019-03-19 20:37:08 +00:00
dependabot[bot]
6c180a0293
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-19 20:28:24 +00:00
Awesome Code
24fb818b2b
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-03-19 07:22:50 +00:00
dependabot[bot]
150e363055
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-19 12:42:49 +13:00
dependabot[bot]
7c3e77fa27
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-19 00:13:09 +13:00
Awesome Code
2a12d8966e
Auto corrected by following Lint Ruby EmptyLine
2019-03-14 23:17:55 +13:00
Awesome Code
5ca65840a8
Auto corrected by following Lint Ruby RSpec/LeadingSubject
2019-03-14 10:08:50 +00:00
dependabot[bot]
f079159e8f
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-14 23:05:51 +13:00
dependabot[bot]
80a919c4f9
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-14 21:36:17 +13:00
Brenda Wallace
63aadfcd98
Merge branch 'master' into dev
2019-03-14 13:29:34 +13:00
Brenda Wallace
7709bf0c3f
Patch Rails
2019-03-14 13:28:37 +13:00
Awesome Code
ad470ede1d
Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace
2019-03-13 17:23:33 +13:00
Awesome Code
cb9d05e355
Auto corrected by following Lint Ruby RSpec/ExpectChange
2019-03-13 16:51:13 +13:00
dependabot[bot]
2d7af01deb
Bump rubocop from 0.64.0 to 0.65.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.64.0 to 0.65.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.64.0...v0.65.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-13 13:56:17 +13:00
Awesome Code
3bc1bba448
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-03-12 22:51:12 +00:00
Awesome Code
f90cc792bb
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-03-13 11:42:27 +13:00
dependabot[bot]
6d071665af
Merge pull request #1845 from Growstuff/dependabot/bundler/faker-1.9.3
2019-03-12 08:56:06 +00:00
dependabot[bot]
300c51f0f6
Bump faker from 1.9.2 to 1.9.3
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.2...v1.9.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-12 08:23:58 +00:00
dependabot[bot]
7b162e6799
Bump haml-rails from 1.0.0 to 2.0.0
...
Bumps [haml-rails](https://github.com/indirect/haml-rails ) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/indirect/haml-rails/releases )
- [Commits](https://github.com/indirect/haml-rails/compare/v1.0.0...v2.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-12 21:20:33 +13:00
dependabot[bot]
ff3d34a40b
Bump byebug from 10.0.2 to 11.0.0
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 10.0.2 to 11.0.0.
- [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/v10.0.2...v11.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-12 00:07:49 +13:00
dependabot[bot]
2105667bca
Bump newrelic_rpm from 6.0.0.351 to 6.1.0.352
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.0.0.351 to 6.1.0.352.
- [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.0.0.351...6.1.0.352 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-11 23:15:11 +13:00
Brenda Wallace
5ab3d85d32
Merge remote-tracking branch 'upstream/master' into material
2019-03-10 16:12:52 +13:00
dependabot[bot]
a631c934d3
Bump capybara from 3.13.2 to 3.14.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.13.2 to 3.14.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.13.2...3.14.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-06 17:46:09 +13:00
Brenda Wallace
200aa9bd5f
Merge pull request #1822 from Growstuff/dev
...
Release 53
2019-02-22 14:25:35 +13:00
Brenda Wallace
3ed173ebcd
Material design changes
2019-02-17 21:33:36 +13:00
Brenda Wallace
c9940f2c94
Merge pull request #1851 from Growstuff/awesomecode-lint-ruby-space-29410
...
Auto corrected by following Lint Ruby Space
2019-02-17 13:58:38 +13:00
Awesome Code
b7cfed1246
Auto corrected by following Lint Ruby Space
2019-02-16 13:42:20 +00:00
pozorvlak
a8c2c2208a
Merge pull request #1775 from Br3nda/photos/seeds
...
Add photos of seeds
2019-02-16 13:39:46 +00:00
pozorvlak
15bffc1031
Merge branch 'dev' into photos/seeds
2019-02-16 11:18:43 +00:00
Brenda Wallace
1c366e8508
Merge pull request #1849 from Growstuff/dependabot/bundler/better_errors-2.5.1
...
Bump better_errors from 2.5.0 to 2.5.1
2019-02-16 14:42:37 +13:00
Brenda Wallace
0c868d3edb
Merge branch 'dev' into photos/seeds
2019-02-16 12:37:53 +13:00
dependabot[bot]
91b590aa58
Bump better_errors from 2.5.0 to 2.5.1
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.0...v2.5.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-15 23:32:03 +00:00
pozorvlak
885c86ecf2
Merge pull request #1847 from Br3nda/fix/crop-delete
...
Fixing crop deleting and adding tests
2019-02-15 23:29:52 +00:00
Brenda Wallace
fe74e41709
Merge branch 'dev' into photos/seeds
2019-02-15 09:21:35 +13:00
Brenda Wallace
f0321b4fcb
Merge branch 'dev' into fix/crop-delete
2019-02-15 09:16:01 +13:00
Brenda Wallace
3967e68038
More info on a crop's varieties, and parent
2019-02-15 09:13:08 +13:00
Brenda Wallace
cc218c367c
Merge remote-tracking branch 'origin/photos/seeds' into photos/seeds
2019-02-15 08:48:51 +13:00
Brenda Wallace
467c92bd2c
Merge pull request #1846 from Growstuff/dependabot/bundler/bootstrap-sass-3.4.1
...
Bump bootstrap-sass from 3.4.0 to 3.4.1
2019-02-15 08:46:38 +13:00
Brenda Wallace
d3a542727c
Fixing crop deleting and adding tests
2019-02-15 08:45:18 +13:00
dependabot[bot]
7090f45285
Bump bootstrap-sass from 3.4.0 to 3.4.1
...
Bumps [bootstrap-sass](https://github.com/twbs/bootstrap-sass ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/twbs/bootstrap-sass/releases )
- [Changelog](https://github.com/twbs/bootstrap-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/twbs/bootstrap-sass/compare/v3.4.0...v3.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-14 07:24:59 +00:00
Brenda Wallace
1441850cd6
Merge branch 'dev' into photos/seeds
2019-02-13 13:59:14 +13:00
Brenda Wallace
c840b1bb16
Merge pull request #1829 from Br3nda/crops-show
...
Crops show
2019-02-13 09:26:21 +13:00
Brenda Wallace
3722672869
Merge branch 'dev' into photos/seeds
2019-02-13 09:06:42 +13:00
Brenda Wallace
fa00262f80
Merge branch 'dev' into crops-show
2019-02-13 09:04:51 +13:00
dependabot[bot]
c0dd3534d3
Merge pull request #1843 from Growstuff/dependabot/bundler/faker-1.9.2
2019-02-12 11:35:32 +00:00
dependabot[bot]
d0e46363b6
Bump faker from 1.9.1 to 1.9.2
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.1...v1.9.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-12 11:04:47 +00:00
dependabot[bot]
77f7c424d8
Merge pull request #1800 from Growstuff/dependabot/bundler/rspec-rails-3.8.2
2019-02-12 11:01:58 +00:00
dependabot[bot]
1d96b11c79
Bump rspec-rails from 3.8.1 to 3.8.2
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-12 10:42:40 +00:00
dependabot[bot]
9fe660ab46
Merge pull request #1841 from Growstuff/dependabot/bundler/rubocop-0.64.0
2019-02-12 10:40:04 +00:00
dependabot[bot]
e9c2454799
Bump rubocop from 0.61.1 to 0.64.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.61.1 to 0.64.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.61.1...v0.64.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-12 10:22:19 +00:00
Cesy
f1eeeb6d6a
Merge pull request #1804 from Br3nda/garden-overview
...
Tidy up display on gardens#index
2019-02-12 10:19:19 +00:00
Brenda Wallace
bd86f7372e
Merge branch 'dev' into garden-overview
2019-02-12 21:50:51 +13:00
Brenda Wallace
f57a423c29
Merge branch 'dev' into crops-show
2019-02-12 21:50:05 +13:00
Brenda Wallace
5930334bd6
Merge branch 'dev' into photos/seeds
2019-02-12 21:49:43 +13:00
ImgBotApp
94403ab5a6
[ImgBot] Optimize images
...
*Total -- 299.13kb -> 245.06kb (18.08%)
/app/assets/images/sunniness_shade.png -- 9.28kb -> 4.27kb (53.98%)
/app/assets/images/blog_32.png -- 5.04kb -> 2.45kb (51.35%)
/app/assets/images/sunniness_semi-shade.png -- 14.52kb -> 7.43kb (48.84%)
/app/assets/images/sunniness_not specified.png -- 15.76kb -> 8.17kb (48.16%)
/app/assets/images/sunniness_sun.png -- 5.77kb -> 3.59kb (37.69%)
/app/assets/images/placeholder_150.png -- 2.44kb -> 1.52kb (37.62%)
/app/assets/images/growstuff-brand.png -- 8.05kb -> 6.45kb (19.94%)
/app/assets/images/flickr_32.png -- 2.47kb -> 2.04kb (17.37%)
/app/assets/images/location-not-set.en.png -- 22.23kb -> 19.55kb (12.04%)
/app/assets/images/facebook-login-splash.png -- 176.17kb -> 155.21kb (11.9%)
/app/assets/images/email_32.png -- 1.07kb -> 0.94kb (11.55%)
/app/assets/images/facebook-thumbnail.png -- 19.48kb -> 17.48kb (10.26%)
/app/assets/images/growstuff-apple-touch-icon-precomposed.png -- 10.37kb -> 9.48kb (8.62%)
/app/assets/images/rails.png -- 6.49kb -> 6.47kb (0.33%)
2019-02-12 21:49:11 +13:00
dependabot[bot]
f37a3669b1
Bump devise from 4.6.0 to 4.6.1
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.0...v4.6.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-12 21:30:47 +13:00
Brenda Wallace
c298a1763f
Merge branch 'dev' into photos/seeds
2019-02-12 16:21:51 +13:00
Brenda Wallace
80f0f41026
removed commented out code
2019-02-12 11:51:16 +13:00
Brenda Wallace
56168576f1
Merge branch 'dev' into garden-overview
2019-02-12 11:49:29 +13:00
Brenda Wallace
73234a1dc3
Merge remote-tracking branch 'origin/crops-show' into crops-show
2019-02-12 11:42:08 +13:00
Brenda Wallace
1dfad812a1
Javascript lint
2019-02-12 11:41:40 +13:00
Brenda Wallace
7a4121bf3f
Added missing semicolon
2019-02-12 11:41:33 +13:00
Brenda Wallace
aa21b000d7
Merge branch 'dev' into crops-show
2019-02-12 11:38:41 +13:00
dependabot[bot]
c8b18cd9b2
Merge pull request #1809 from Growstuff/dependabot/bundler/capybara-3.13.2
2019-02-11 22:31:15 +00:00
Brenda Wallace
2f5de1f98e
Merge branch 'dev' into garden-overview
2019-02-12 11:28:45 +13:00
dependabot[bot]
0a1206b692
Bump capybara from 3.13.0 to 3.13.2
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.13.0 to 3.13.2.
- [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.13.0...3.13.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-11 10:45:16 +00:00
pozorvlak
378dd52b1f
Merge pull request #1818 from Br3nda/contributors-bots
...
Fixes checking for github bots in contributors
2019-02-11 10:38:47 +00:00
pozorvlak
f83b8e71f1
Merge branch 'dev' into contributors-bots
2019-02-11 10:17:09 +00:00
Awesome Code
3efc0caaf7
Auto corrected by following Lint Ruby EmptyLine
2019-02-11 11:02:33 +13:00
Awesome Code
689baa85a3
Auto corrected by following Lint Ruby RSpec/ExampleWording
2019-02-11 10:17:54 +13:00
Awesome Code
29ee362bfa
Auto corrected by following Lint Ruby Space
2019-02-11 09:28:43 +13:00
Awesome Code
490db7b342
Auto corrected by following Lint Ruby RSpec/HookArgument
2019-02-11 09:00:34 +13:00
Brenda Wallace
463e0d919c
Merge branch 'dev' into crops-show
2019-02-11 08:17:44 +13:00
Brenda Wallace
a320826abd
Merge pull request #1834 from Growstuff/awesomecode-lint-ruby-rspec-returnfromstub-28915
...
Auto corrected by following Lint Ruby RSpec/ReturnFromStub
2019-02-11 08:02:53 +13:00
Brenda Wallace
db58abc520
Merge branch 'dev' into awesomecode-lint-ruby-rspec-returnfromstub-28915
2019-02-11 07:37:21 +13:00
Brenda Wallace
37b1c17ca9
Merge pull request #1835 from Growstuff/awesomecode-lint-ruby-rspec-sharedcontext-28915
...
Auto corrected by following Lint Ruby RSpec/SharedContext
2019-02-11 07:36:55 +13:00
Brenda Wallace
380b0ffa6c
Merge branch 'dev' into awesomecode-lint-ruby-rspec-sharedcontext-28915
2019-02-11 00:24:20 +13:00
Brenda Wallace
4be359c2b9
Merge branch 'dev' into crops-show
2019-02-10 22:24:40 +13:00
Awesome Code
bbd34c5e7b
Auto corrected by following Lint Ruby RSpec/SharedContext
2019-02-10 09:24:19 +00:00
Awesome Code
54798190a7
Auto corrected by following Lint Ruby RSpec/ReturnFromStub
2019-02-10 09:24:07 +00:00
Awesome Code
49eed9b208
Auto corrected by following Lint Ruby RSpec/LetBeforeExamples
2019-02-10 09:24:00 +00:00
Awesome Code
e32a8bd6ac
Auto corrected by following Lint Ruby RSpec/HooksBeforeExamples
2019-02-10 09:23:43 +00:00
Brenda Wallace
0507f337aa
Merge branch 'dev' into crops-show
2019-02-10 21:52:51 +13:00
Brenda Wallace
fb6a270fa6
Tidy up crop predictions display
2019-02-10 21:51:06 +13:00
Brenda Wallace
e9d81f7f32
Merge branch 'dev' into garden-overview
2019-02-09 19:13:46 +13:00
Brenda Wallace
29da3f7ff1
Merge branch 'dev' into contributors-bots
2019-02-09 19:13:26 +13:00
Brenda Wallace
3f68131ed1
Merge pull request #1820 from Growstuff/dependabot/bundler/devise-4.6.0
...
Bump devise from 4.5.0 to 4.6.0
2019-02-09 19:13:05 +13:00
Brenda Wallace
572af9d135
Merge branch 'dev' into photos/seeds
2019-02-09 17:00:58 +13:00
Brenda Wallace
9be4bf2685
Merge branch 'dev' into garden-overview
2019-02-09 17:00:07 +13:00
Brenda Wallace
68d9b9c50c
Merge branch 'dev' into contributors-bots
2019-02-09 16:59:45 +13:00
Awesome Code
284bb81bbf
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-02-09 03:05:40 +00:00
Brenda Wallace
93835b3ee6
Javascript lint
2019-02-09 15:21:30 +13:00
Brenda Wallace
67b23d8e2c
Merge branch 'dev' into garden-overview
2019-02-09 15:17:09 +13:00
Brenda Wallace
63b8554435
Added missing semicolon
2019-02-09 15:16:53 +13:00
dependabot[bot]
228253113f
Bump devise from 4.5.0 to 4.6.0
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.5.0...v4.6.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-09 01:28:51 +00:00
Brenda Wallace
6902f30bb8
Merge branch 'dev' into contributors-bots
2019-02-09 14:26:53 +13:00
Brenda Wallace
ac577486e1
Merge branch 'master' into dev
2019-02-09 14:26:26 +13:00
Brenda Wallace
6e1972717f
Merge pull request #1826 from Growstuff/awesomecode-lint-ruby-emptyline-28892
...
Auto corrected by following Lint Ruby EmptyLine
2019-02-09 14:26:11 +13:00
Brenda Wallace
18d7ae2953
Further tidy up of the planting quick action buttons
2019-02-09 14:24:51 +13:00
Brenda Wallace
95db0f7297
Shortened the text on the badges
2019-02-09 14:18:15 +13:00
Brenda Wallace
ec4b443d8c
Tool tips
2019-02-09 14:13:07 +13:00
Brenda Wallace
50751611fa
Tidy up where badges appear
2019-02-09 14:12:45 +13:00
Brenda Wallace
fc95a3c4e1
Moved planting css to own file
2019-02-09 14:12:30 +13:00
Brenda Wallace
dfe67d5308
Move thumbnail title up a bit
2019-02-09 12:13:22 +13:00
Brenda Wallace
aa8ed5bb3a
Fix up translation on badges
2019-02-09 11:47:13 +13:00
Brenda Wallace
fcd147412c
Tidy up display on gardens#index
2019-02-09 11:47:13 +13:00
Brenda Wallace
61548e02d1
Merge branch 'dev' into contributors-bots
2019-02-09 11:03:36 +13:00
Awesome Code
404fafd700
Auto corrected by following Lint Ruby EmptyLine
2019-02-08 21:10:48 +00:00
Awesome Code
39a7de8754
Auto corrected by following Lint Ruby EmptyLine
2019-02-08 20:26:29 +00:00
Brenda Wallace
7a94920966
Merge pull request #1823 from Growstuff/awesomecode-lint-ruby-rspec-layout-28889
...
Auto corrected by following Lint Ruby rspec layout
2019-02-09 09:24:16 +13:00
Awesome Code
c4a3c03c34
Auto corrected by following Lint Ruby rspec layout
2019-02-08 20:23:08 +00:00
Brenda Wallace
1539aaa140
Merge pull request #1821 from Br3nda/api-additions
...
Adding more attributes and filters to the api
2019-02-09 09:20:38 +13:00
Brenda Wallace
cde61a1c4f
Use Regex to search for author
2019-02-09 09:04:24 +13:00
Brenda Wallace
bffbd94462
Read the file contents in ruby
2019-02-09 09:03:34 +13:00
Brenda Wallace
9a4f1058e1
Adding more attributes and filters to the api
2019-02-09 08:43:59 +13:00
Brenda Wallace
c8e5cecaf6
Fixes checking for github bots in contributors
2019-02-08 09:51:41 +13:00
Brenda Wallace
452007dc5d
Merge pull request #1817 from Growstuff/dev
...
Release to production
2019-02-07 18:57:56 +13:00
Brenda Wallace
e6de37c8ce
Tests for crop.photos
2019-02-07 15:02:11 +13:00
Brenda Wallace
b7fe5e156e
Fixed brackets, because ruby needs those sometimes
2019-02-05 17:18:36 +13:00
Brenda Wallace
c0fdf262f4
Fixed method name in spec
2019-02-05 17:11:59 +13:00
Brenda Wallace
f6ba22fb28
Fixed typo in spec
2019-02-05 17:10:34 +13:00
Brenda Wallace
e446c14bd7
Use the new Photo.by_cropscope on photos controller
2019-02-05 12:44:34 +13:00
Brenda Wallace
9ff95506bd
Spects for Photo.by_crop
2019-02-05 12:40:15 +13:00
Brenda Wallace
5c0e31721f
tests for crops.by_model_type scope
2019-02-05 12:37:35 +13:00
Brenda Wallace
51e6da7da6
Rubocop lint tidxy
2019-02-05 12:37:23 +13:00
Brenda Wallace
6167af700d
Rubocop lint tidy
2019-02-05 12:37:09 +13:00
Brenda Wallace
9c4e649c5d
Split up photos on crops#show by model type
2019-02-05 12:31:59 +13:00
Brenda Wallace
f640e41b55
Add seeds to crops api spec
2019-02-05 10:23:10 +13:00
Brenda Wallace
18ab0c8697
Add photos back into crop resources
2019-02-05 10:22:58 +13:00
Brenda Wallace
1ea19bee9d
Not planted means the percent_grown is 0
2019-02-05 09:59:20 +13:00
Brenda Wallace
49f7e57334
Make use of factory bot
2019-02-05 09:59:09 +13:00
Brenda Wallace
8d58edf083
Set hte crops in photos#show view spec
2019-02-04 22:35:42 +13:00
Brenda Wallace
b61c2290be
Removed unnecesary helper wrapper
2019-02-04 22:15:18 +13:00
Brenda Wallace
6be8f05223
Set the planted at date to the past (so we don't end up with 0%)
2019-02-04 22:11:50 +13:00
Brenda Wallace
1ead9e333b
Fixed up planting_status when planting no planted yet
2019-02-04 21:55:23 +13:00
Brenda Wallace
dd38a69be7
Fixed up planting status text to match tests
2019-02-04 21:52:13 +13:00
Brenda Wallace
862bdf35f5
Look for crop card on photo#show
2019-02-04 21:43:31 +13:00
Brenda Wallace
bb5a606240
Updated string to look for when planting
2019-02-04 21:43:10 +13:00
Brenda Wallace
d2c63db59b
Translate planting status
2019-02-04 21:42:54 +13:00
Brenda Wallace
6a1954b1e7
added dependent: destroy
2019-02-04 21:22:19 +13:00
Brenda Wallace
8e29a86edf
Merge remote-tracking branch 'origin/photos/seeds' into photos/seeds
2019-02-04 21:19:30 +13:00
Brenda Wallace
d71f6f9fc4
Rubocop tidy up
2019-02-04 21:17:41 +13:00
Brenda Wallace
b29c830f65
Merge branch 'dev' into photos/seeds
2019-02-04 21:17:08 +13:00
Brenda Wallace
b8747d7c52
Controller specs for photos#index
2019-02-04 21:15:10 +13:00
Brenda Wallace
a074810988
FEature specs for showing photos on crops#show
2019-02-04 21:03:31 +13:00
Brenda Wallace
81c899079e
Removed commented out code
2019-02-04 20:57:35 +13:00
Brenda Wallace
f1ad9cc3c7
Rubocop fix up
2019-02-04 20:55:04 +13:00
Brenda Wallace
0759ca9039
Schema update for crops added to photogaphings table
2019-02-04 20:53:04 +13:00
Brenda Wallace
5822764c1d
Fetch photos in the controller
2019-02-04 20:52:13 +13:00
Brenda Wallace
42de920352
Removed display of status
2019-02-04 20:44:20 +13:00
Brenda Wallace
ab880514c2
Further tidy of photo display
2019-02-04 20:43:52 +13:00
Brenda Wallace
dbf707d80e
Crops have seeds
2019-02-04 20:32:23 +13:00
Brenda Wallace
e8ac207fa7
Save the crop on the photo association
2019-02-04 20:32:11 +13:00
Brenda Wallace
a9ca12c1c5
Method to find planting photos only
2019-02-04 19:39:44 +13:00
Brenda Wallace
87d2c8b4c8
Fixed bug - look up photos by crop
2019-02-04 19:39:21 +13:00
Brenda Wallace
b29ab46a48
Merge pull request #1808 from Growstuff/dependabot/bundler/rubocop-rspec-1.32.0
...
Bump rubocop-rspec from 1.31.0 to 1.32.0
2019-02-02 23:22:10 +13:00
dependabot[bot]
951076bc85
Bump rubocop-rspec from 1.31.0 to 1.32.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.31.0 to 1.32.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.31.0...v1.32.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-01 20:17:34 +00:00
Brenda Wallace
76f4ffc78a
Merge pull request #1805 from Br3nda/fix/recent-harvests
...
Fix/recent harvests
2019-02-02 09:14:27 +13:00
Brenda Wallace
e3a0de081e
Merge branch 'dev' into photos/seeds
2019-01-30 16:46:42 +13:00
Brenda Wallace
8c03e3f4ab
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-30 16:45:14 +13:00
Brenda Wallace
41082b31a9
Merge branch 'dev' into fix/recent-harvests
2019-01-30 16:44:47 +13:00
Brenda Wallace
6ebe853cb3
Merge pull request #1771 from Br3nda/routes-tidy-up
...
Routes tidy up
2019-01-30 16:44:30 +13:00
Brenda Wallace
682de8f815
Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up
2019-01-30 15:25:31 +13:00
Brenda Wallace
4c02a3247e
Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
2019-01-30 15:25:19 +13:00
Brenda Wallace
6acc6bd5ee
Tell rspec which gardens button to use
2019-01-30 15:25:07 +13:00
Brenda Wallace
0bb483e8eb
Merge branch 'dev' into routes-tidy-up
2019-01-30 15:20:41 +13:00
Brenda Wallace
96fc9d9368
Merge branch 'dev' into fix/recent-harvests
2019-01-30 15:20:30 +13:00
Brenda Wallace
02ed494898
Merge pull request #1810 from Growstuff/dependabot/bundler/newrelic_rpm-6.0.0.351
...
Bump newrelic_rpm from 5.7.0.350 to 6.0.0.351
2019-01-30 15:20:14 +13:00
dependabot[bot]
964dbe5e54
Bump newrelic_rpm from 5.7.0.350 to 6.0.0.351
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.7.0.350 to 6.0.0.351.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-29 07:20:30 +00:00
Brenda Wallace
9325f03019
Merge pull request #1788 from Growstuff/dependabot/bundler/newrelic_rpm-5.7.0.350
...
Bump newrelic_rpm from 5.6.0.349 to 5.7.0.350
2019-01-28 16:13:01 +13:00
Brenda Wallace
3d3d1407cd
Fixed link in global actions
2019-01-27 18:28:42 +13:00
Brenda Wallace
52272550c8
Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
2019-01-27 18:25:43 +13:00
Brenda Wallace
6484e4e6e5
Merge branch 'dev' into fix/recent-harvests
2019-01-27 18:25:22 +13:00
Brenda Wallace
10beb65e1a
Feature spec to check most recently planted/harvested on crops#show
2019-01-27 18:23:15 +13:00
Brenda Wallace
ea35816654
Fix ordering of recent harvests
2019-01-27 18:12:37 +13:00
dependabot[bot]
9c13064191
Bump newrelic_rpm from 5.6.0.349 to 5.7.0.350
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.6.0.349 to 5.7.0.350.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-26 22:56:56 +00:00
pozorvlak
0664324d29
Merge pull request #1798 from Br3nda/remove-mandrill
...
Remove references to MANDRILL
2019-01-26 22:54:32 +00:00
Brenda Wallace
bc576ccc44
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-27 11:43:49 +13:00
Brenda Wallace
7f8ae04520
Merge branch 'dev' into remove-mandrill
2019-01-27 11:43:33 +13:00
Brenda Wallace
2057aef0ea
Merge pull request #1802 from Growstuff/dependabot/bundler/capybara-3.13.0
...
Bump capybara from 3.12.0 to 3.13.0
2019-01-27 11:42:13 +13:00
Brenda Wallace
02d96bcc51
Removed another mandril reference
2019-01-26 14:02:50 +13:00
pozorvlak
80b0cc973d
Merge pull request #1797 from Growstuff/dev
...
Release 51
2019-01-24 17:33:09 +00:00
dependabot[bot]
5323558204
Bump capybara from 3.12.0 to 3.13.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.12.0 to 3.13.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.12.0...3.13.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-24 07:34:02 +00:00
Brenda Wallace
b892548b12
Merge branch 'dev' into routes-tidy-up
2019-01-24 16:09:39 +13:00
Brenda Wallace
b1d34a7fa2
Merge branch 'dev' into remove-mandrill
2019-01-24 15:52:58 +13:00
Brenda Wallace
60e222d9bb
Merge pull request #1796 from Br3nda/app-json-heroku
...
Fixing the app.json for Bonsai
2019-01-24 15:52:38 +13:00
Brenda Wallace
32b2cbd921
Merge branch 'button-translate' into routes-tidy-up
...
Conflicts:
app/views/crops/_search_bar.haml
app/views/layouts/application.html.haml
2019-01-24 13:49:53 +13:00
Brenda Wallace
986bca44f7
Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
...
Conflicts:
app/views/layouts/_header.html.haml
spec/features/gardens/actions_spec.rb
2019-01-24 13:48:36 +13:00
Brenda Wallace
45890fec59
Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up
2019-01-24 13:47:17 +13:00
Brenda Wallace
fc6183eb52
DRY actions more
2019-01-24 13:46:35 +13:00
Brenda Wallace
e66f8298c8
Merge branch 'dev' into remove-mandrill
2019-01-24 12:20:39 +13:00
Brenda Wallace
e17e5c9297
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-24 12:20:26 +13:00
Brenda Wallace
9f3b757d2b
Merge branch 'dev' into app-json-heroku
2019-01-24 12:20:01 +13:00
Brenda Wallace
f6deaffb94
Fixed nested row on layout, that was breaking photo add page
2019-01-24 12:17:40 +13:00
Brenda Wallace
449e8da25a
Added missing translation for Edit profile button
2019-01-24 12:17:40 +13:00
Brenda Wallace
d73f8716c0
Include font awesome (so specs pass)
2019-01-24 12:17:40 +13:00
Brenda Wallace
e202c73584
Update buttons_helper.rb
2019-01-24 12:17:40 +13:00
Brenda Wallace
8bfe3278cc
Include icon helper from button helper
2019-01-24 12:17:40 +13:00
Brenda Wallace
a54db7d5ff
Tidied up the planting actions on gardens#index
2019-01-24 12:17:40 +13:00
Brenda Wallace
80e0d964e1
indentation clean up
2019-01-24 12:17:40 +13:00
Brenda Wallace
5218685bd9
Tidy up member edit buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
94a5411a79
Wider action bar
2019-01-24 12:17:40 +13:00
Brenda Wallace
88a277c6ed
Move consistent icons
2019-01-24 12:17:40 +13:00
Brenda Wallace
e912211cee
DRY the icons
2019-01-24 12:17:40 +13:00
Brenda Wallace
4e82584a0a
Fixed label on link in spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
a09c6603e2
Fixed photo specs to find the button on the actions view
2019-01-24 12:17:40 +13:00
Brenda Wallace
2380d62258
Use new finish button on planting badges
2019-01-24 12:17:40 +13:00
Brenda Wallace
1460d4822a
Crop name is in button label - add to spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
28422bfd1d
Seperate some specs
2019-01-24 12:17:40 +13:00
Brenda Wallace
81ee8ec56e
Add crop name to actions
2019-01-24 12:17:40 +13:00
Brenda Wallace
2a98cefedb
Copy finish planting from view to helper
2019-01-24 12:17:40 +13:00
Brenda Wallace
99fb21eebe
Find maze button in spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
33ad133665
Revert modifications to menu
2019-01-24 12:17:40 +13:00
Brenda Wallace
ca75b1c852
Use button helper for crop wrangling
2019-01-24 12:17:40 +13:00
Brenda Wallace
c9be8be9e5
Remove new planting button spec
...
because it's in the button bar now
2019-01-24 12:17:40 +13:00
Brenda Wallace
8023d71a21
Removed outdated spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
6e433306f4
Capitalise some translations
2019-01-24 12:17:40 +13:00
Brenda Wallace
655efb26eb
Removing some unused translations
2019-01-24 12:17:40 +13:00
Brenda Wallace
97675868bd
Fixed button link, using translation that exists
2019-01-24 12:17:40 +13:00
Brenda Wallace
424866b733
Add "something" to global action labels
2019-01-24 12:17:40 +13:00
Brenda Wallace
c78b96b9d6
Update from should to expect syntax
2019-01-24 12:17:40 +13:00
Brenda Wallace
8ec35cc65c
Action specs for someone else's garden
2019-01-24 12:17:40 +13:00
Brenda Wallace
e6e582cb4a
Move some action button specs to feature specs
...
because it's in a buttonbar, not the view now
2019-01-24 12:17:40 +13:00
Brenda Wallace
761a0b4142
Always use the helper for add_photo buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
9130b44fb9
Rubocop fixup
2019-01-24 12:17:40 +13:00
Brenda Wallace
8eb9487967
Move home page greeting test to features spec (from views)
2019-01-24 12:17:40 +13:00
Brenda Wallace
a6ac57f045
Tests for edit and add photo buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
a95c3a988c
DRY the add photo buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
a8547d6033
Update labels on button in crop detail spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
22e50aa618
DRY the edit buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
ad001767e2
Move seed buttongs to buttons helper
2019-01-24 12:17:40 +13:00
Brenda Wallace
b58e0cf3ce
Moved garden actions code to top of view
2019-01-24 12:17:40 +13:00
Brenda Wallace
8ae062fe9b
Added missing harvest actions
2019-01-24 12:17:40 +13:00
Brenda Wallace
c811ab1f51
Moved harvest buttons to match other #show pages
2019-01-24 12:17:40 +13:00
Brenda Wallace
8270611f0c
Removed un-used viewss
2019-01-24 12:17:40 +13:00
Brenda Wallace
02d4d12582
suffix _button to button helpers
2019-01-24 12:17:40 +13:00
Brenda Wallace
8df90dacfc
Seperate specs
2019-01-24 12:17:40 +13:00
Brenda Wallace
6ced6c5c4e
Update link label in spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
dfd7765c47
Rubocop fix ups
2019-01-24 12:17:40 +13:00
Brenda Wallace
e2a0278e40
Use same t() for the button for writing blog posts
2019-01-24 12:17:40 +13:00
Brenda Wallace
313a18db08
Titles of pages consistent with buttons to pages
2019-01-24 12:17:40 +13:00
Brenda Wallace
67e58fe901
Moving buttons to the right of page (with translations)
2019-01-24 12:17:40 +13:00
Brenda Wallace
b86e6e6dab
More translations in garden actions
2019-01-24 12:17:40 +13:00
Brenda Wallace
de3c7fb1c5
Move homepage title to the :title content
2019-01-24 12:17:40 +13:00
Brenda Wallace
ba38637392
Wrapping crop actions in btn-group
2019-01-24 12:17:40 +13:00
Brenda Wallace
d1c367e3d9
Fixed glyphicons
2019-01-24 12:17:40 +13:00
Brenda Wallace
fcfe7f196e
Button for planting stuff
2019-01-24 12:17:40 +13:00
Brenda Wallace
614eff06b9
Bigger buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
a4f20bff77
More button label translations
2019-01-24 12:17:40 +13:00
Brenda Wallace
f5a63d770c
Moving garden actions to button bar
2019-01-24 12:17:40 +13:00
Brenda Wallace
279ce38c86
Moving actions to the button bar
2019-01-24 12:17:40 +13:00
Brenda Wallace
6eebc7480c
Moved global actions - only show if no buttonbar
2019-01-24 12:17:40 +13:00
Brenda Wallace
acc100f744
Adding missing translations for plantings
2019-01-24 12:17:40 +13:00
Brenda Wallace
2f271da909
Move global buttons and search
2019-01-24 12:17:40 +13:00
Brenda Wallace
6c16dca9b4
Dry the gglypicons
2019-01-24 12:17:40 +13:00
Brenda Wallace
30255a24d2
Use buttons.* translations for glyphicons titles
2019-01-24 12:17:40 +13:00
Brenda Wallace
e886929af5
Put buttons translations under buttons namespace
2019-01-24 12:17:40 +13:00
Brenda Wallace
7169b624b0
Move the action buttons to EVERY page
2019-01-24 12:17:40 +13:00
Brenda Wallace
a3f32aba9b
Call t() on button labels
2019-01-24 12:17:40 +13:00
Brenda Wallace
79c22308df
Fixed nested row on layout, that was breaking photo add page
2019-01-24 11:58:58 +13:00
Brenda Wallace
87c7596ab7
Added missing translation for Edit profile button
2019-01-24 11:54:55 +13:00
Brenda Wallace
251365654f
Include font awesome (so specs pass)
2019-01-24 11:51:48 +13:00
Brenda Wallace
943a5df870
Merge remote-tracking branch 'origin/button-translate' into button-translate
2019-01-24 10:40:24 +13:00
Brenda Wallace
8586d7c73d
Update buttons_helper.rb
2019-01-24 09:18:46 +13:00
Brenda Wallace
a8b9d0d5ff
Include icon helper from button helper
2019-01-24 09:17:13 +13:00
Brenda Wallace
d270be83d0
Tidied up the planting actions on gardens#index
2019-01-23 22:30:44 +13:00
Brenda Wallace
09230fe4e7
indentation clean up
2019-01-23 21:59:06 +13:00
Brenda Wallace
de01cc9c00
Tidy up member edit buttons
2019-01-23 21:57:21 +13:00
Brenda Wallace
2d68aa2082
Wider action bar
2019-01-23 21:49:17 +13:00
Brenda Wallace
e78180dc3a
Move consistent icons
2019-01-23 21:49:11 +13:00
Brenda Wallace
001c0251b2
DRY the icons
2019-01-23 17:34:32 +13:00
Brenda Wallace
a1b576aab4
Fixed label on link in spec
2019-01-23 16:54:07 +13:00
Brenda Wallace
45aa0f1c70
Fixed photo specs to find the button on the actions view
2019-01-23 16:49:06 +13:00
Brenda Wallace
e116229b7b
Use new finish button on planting badges
2019-01-23 16:35:12 +13:00
Brenda Wallace
6c04d26638
Crop name is in button label - add to spec
2019-01-23 16:31:44 +13:00
Brenda Wallace
f39af27538
Seperate some specs
2019-01-23 16:25:01 +13:00
Brenda Wallace
045deb1ae4
Add crop name to actions
2019-01-23 16:19:08 +13:00
Brenda Wallace
9bb08e9dac
Merge remote-tracking branch 'upstream/dev' into button-translate
2019-01-23 16:15:47 +13:00
Brenda Wallace
4d2936b68d
Copy finish planting from view to helper
2019-01-23 16:15:09 +13:00
Brenda Wallace
af7e59e45a
Find maze button in spec
2019-01-23 16:14:22 +13:00
Brenda Wallace
0fa5513bf8
Revert modifications to menu
2019-01-23 15:49:13 +13:00
Brenda Wallace
4fcd892458
Use button helper for crop wrangling
2019-01-23 15:06:56 +13:00
Brenda Wallace
7779f7ec05
Remove new planting button spec
...
because it's in the button bar now
2019-01-23 15:01:34 +13:00
Brenda Wallace
066eaab1c2
Removed outdated spec
2019-01-23 14:54:43 +13:00
Brenda Wallace
a323da6780
Capitalise some translations
2019-01-23 14:52:40 +13:00
Brenda Wallace
409dc1a276
Removing some unused translations
2019-01-23 14:52:17 +13:00
Brenda Wallace
79dfe2b84d
Fixed button link, using translation that exists
2019-01-23 14:37:18 +13:00
Brenda Wallace
3965fa1934
Add "something" to global action labels
2019-01-23 14:37:00 +13:00
Brenda Wallace
14441b6238
Update from should to expect syntax
2019-01-23 14:36:48 +13:00
Brenda Wallace
d980b9af4e
Action specs for someone else's garden
2019-01-23 14:36:36 +13:00
Brenda Wallace
e5bb6fa154
Move some action button specs to feature specs
...
because it's in a buttonbar, not the view now
2019-01-23 14:33:48 +13:00
Brenda Wallace
a926b37ad9
Always use the helper for add_photo buttons
2019-01-23 14:07:39 +13:00
Brenda Wallace
887886ebae
Rubocop fixup
2019-01-23 14:04:48 +13:00
Brenda Wallace
c52e735a0b
Move home page greeting test to features spec (from views)
2019-01-23 14:03:36 +13:00
Brenda Wallace
1ce0c840d2
Merge branch 'dev' into photos/seeds
2019-01-23 13:59:33 +13:00
Brenda Wallace
7acff05ccc
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-23 13:58:31 +13:00
Brenda Wallace
5a2f7dfe25
Merge branch 'dev' into routes-tidy-up
2019-01-23 13:58:01 +13:00
apdarr
4f4421cb38
enforce ssl for new relic
2019-01-23 13:57:32 +13:00
apdarr
58f8a88242
set newrelic to use ssl
2019-01-23 13:57:32 +13:00
Brenda Wallace
06eb01b7c5
Tests for edit and add photo buttons
2019-01-23 08:04:06 +13:00
Brenda Wallace
a5d1303918
DRY the add photo buttons
2019-01-23 08:03:57 +13:00
Brenda Wallace
f7eaf90b77
Update labels on button in crop detail spec
2019-01-22 17:20:52 +13:00
Brenda Wallace
0350d634c6
DRY the edit buttons
2019-01-22 17:20:34 +13:00
Brenda Wallace
e1bc635b04
Move seed buttongs to buttons helper
2019-01-22 17:15:25 +13:00
Brenda Wallace
a2b9a36615
Moved garden actions code to top of view
2019-01-22 17:11:50 +13:00
Brenda Wallace
01a7b7fd37
Added missing harvest actions
2019-01-22 17:11:30 +13:00
Brenda Wallace
dc4292f948
Moved harvest buttons to match other #show pages
2019-01-22 17:11:22 +13:00
Brenda Wallace
431572a77a
Removed un-used viewss
2019-01-22 17:03:34 +13:00
Brenda Wallace
adf3853c09
suffix _button to button helpers
2019-01-22 16:58:13 +13:00
Brenda Wallace
1809ca2746
Seperate specs
2019-01-22 16:54:54 +13:00
Brenda Wallace
57bcac8b02
Update link label in spec
2019-01-22 16:54:25 +13:00
Brenda Wallace
72c957967d
Rubocop fix ups
2019-01-22 16:48:57 +13:00
Brenda Wallace
8ead646bf9
Use same t() for the button for writing blog posts
2019-01-22 16:46:44 +13:00
Brenda Wallace
90b0d0956e
Titles of pages consistent with buttons to pages
2019-01-22 15:55:41 +13:00
Brenda Wallace
d418745e87
Moving buttons to the right of page (with translations)
2019-01-22 15:19:24 +13:00
Brenda Wallace
42d3db9ba4
More translations in garden actions
2019-01-21 18:43:37 +13:00
Brenda Wallace
acab1db135
Move homepage title to the :title content
2019-01-21 18:43:25 +13:00
Brenda Wallace
d6fa35099e
Wrapping crop actions in btn-group
2019-01-21 18:43:07 +13:00
Brenda Wallace
207e962501
Fixed glyphicons
2019-01-21 18:42:52 +13:00
Brenda Wallace
9a6bd714cb
Button for planting stuff
2019-01-21 18:42:44 +13:00
Brenda Wallace
dcd6e3d27c
Bigger buttons
2019-01-21 18:42:34 +13:00
Brenda Wallace
f5a61ba486
More button label translations
2019-01-21 18:42:21 +13:00
Brenda Wallace
f52bb9737d
Moving garden actions to button bar
2019-01-21 18:42:13 +13:00
Brenda Wallace
9f61d7212c
Moving actions to the button bar
2019-01-21 18:42:02 +13:00
Brenda Wallace
fbc958b76a
Moved global actions - only show if no buttonbar
2019-01-21 18:41:51 +13:00
Brenda Wallace
bc359412af
Adding missing translations for plantings
2019-01-21 14:19:40 +13:00
Brenda Wallace
e8a4cc61ea
Move global buttons and search
2019-01-21 14:13:36 +13:00
Brenda Wallace
73fa667c1d
Dry the gglypicons
2019-01-21 14:13:12 +13:00
Brenda Wallace
e6dea31935
Use buttons.* translations for glyphicons titles
2019-01-21 13:40:56 +13:00
Brenda Wallace
47e11c5b7c
Put buttons translations under buttons namespace
2019-01-21 13:37:58 +13:00
Brenda Wallace
0914caae88
Move the action buttons to EVERY page
2019-01-21 11:47:25 +13:00
Brenda Wallace
24ead96a71
Call t() on button labels
2019-01-21 11:46:50 +13:00
Brenda Wallace
e1fdc729db
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-21 11:36:46 +13:00
Brenda Wallace
2b20d32645
Merge branch 'dev' into routes-tidy-up
2019-01-21 11:36:25 +13:00
Brenda Wallace
2bf328be15
Merge branch 'dev' into app-json-heroku
2019-01-21 11:35:31 +13:00
Brenda Wallace
4825cb44ae
Merge branch 'dev' into remove-mandrill
2019-01-21 11:35:22 +13:00
Brenda Wallace
2539899934
Fix notification specs
2019-01-21 10:50:22 +13:00
Brenda Wallace
31321fce17
Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
2019-01-19 12:52:19 +13:00
Brenda Wallace
f07dc1956b
Merge branch 'dev' into app-json-heroku
2019-01-19 12:38:39 +13:00
Brenda Wallace
45793c1cec
Merge branch 'dev' into routes-tidy-up
2019-01-19 12:37:53 +13:00
Brenda Wallace
5b732fedae
Remove references to MANDRILL
2019-01-19 12:36:27 +13:00
Brenda Wallace
f453682696
Fixing sendgrid
2019-01-19 12:33:58 +13:00
Brenda Wallace
6f23a203a2
Switch to SendGrid (remove sparkhost)
2019-01-19 11:57:50 +13:00
Brenda Wallace
b28bddaf0c
Merge branch 'dev' into app-json-heroku
2019-01-19 09:37:28 +13:00
Brenda Wallace
b9471e3a6e
Merge branch 'dev' into photos/seeds
2019-01-19 09:35:00 +13:00
dependabot[bot]
4be6169c93
Bump jsonapi-resources from 0.9.4 to 0.9.5
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.4 to 0.9.5.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.4...v0.9.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-19 09:33:19 +13:00
Brenda Wallace
2bb80746e0
Merge branch 'dev' into routes-tidy-up
2019-01-19 09:32:48 +13:00
Brenda Wallace
a690dc1479
Merge branch 'dev' into app-json-heroku
2019-01-19 09:04:04 +13:00
Brenda Wallace
cab5986573
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-19 09:00:57 +13:00
Brenda Wallace
2c48596de9
Merge branch 'master' into dev
2019-01-19 09:00:15 +13:00
Brenda Wallace
e296f15981
Merge branch 'dev' into routes-tidy-up
2019-01-19 08:57:19 +13:00
Brenda Wallace
2b6645d3b5
Merge branch 'dev' into app-json-heroku
2019-01-19 08:56:57 +13:00
Awesome Code
36765808b9
Auto corrected by following Format Css Code
2019-01-19 08:54:52 +13:00
Brenda Wallace
b6a7fa0efd
Force to redirect to ssl
2019-01-19 08:51:55 +13:00
pozorvlak
83f3872488
Merge pull request #1761 from Growstuff/dev
...
Release 50
2019-01-18 17:31:10 +00:00
Brenda Wallace
b35d13d5e5
Update seeds_controller.rb
2019-01-18 20:05:41 +13:00
Brenda Wallace
d1a3f41462
Throw if can't find the @crop
2019-01-18 20:04:19 +13:00
Brenda Wallace
3212f748b4
Update crops_controller.rb
2019-01-18 20:03:22 +13:00
Brenda Wallace
cb6a06feb6
find by slug
2019-01-18 20:02:15 +13:00
Brenda Wallace
e337fcb7f7
Put displayed member back to using member.slug
2019-01-18 20:00:59 +13:00
Brenda Wallace
a06516b80f
Put displayed link back to using login_name
2019-01-18 20:00:31 +13:00
Brenda Wallace
a69f5bf65f
Merge branch 'dev' into UTFGardenNames
2019-01-18 18:54:13 +13:00
Brenda Wallace
1fc70e5a2b
Rubocop linting
2019-01-18 14:54:24 +13:00
Brenda Wallace
4ea9dda5e9
Merge branch 'fix/1792-sparkhost-deprecated' into app-json-heroku
...
Conflicts:
app.json
2019-01-18 14:52:53 +13:00
Brenda Wallace
03c8d75899
Fixing the app.json for Bonsai
2019-01-18 14:48:04 +13:00
Brenda Wallace
6273fa684c
Models (plot and container) need to sub class ApplicationRecord
2019-01-18 14:34:47 +13:00
Brenda Wallace
f7d989bb61
Squashed migrations and set as Rails4.2
2019-01-18 14:31:35 +13:00
Brenda Wallace
ecb0d0bc0b
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-18 14:28:46 +13:00
Brenda Wallace
9a18918b42
Merge branch 'dev' into routes-tidy-up
2019-01-18 14:27:42 +13:00
Brenda Wallace
656510855d
Switch to new syntax for initing uglifier
2019-01-18 14:21:11 +13:00
Brenda Wallace
6c70044a7f
Switch to SendGrid (remove sparkhost)
2019-01-18 14:13:21 +13:00
Brenda Wallace
44f4cc621e
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-17 12:49:31 +13:00
Brenda Wallace
7a4f6fd512
Merge branch 'dev' into photos/seeds
2019-01-09 20:57:46 +13:00
Brenda Wallace
3145df9153
Merge pull request #1785 from Growstuff/dependabot/bundler/sidekiq-5.2.5
...
Bump sidekiq from 5.2.3 to 5.2.5
2019-01-09 20:57:08 +13:00
dependabot[bot]
51f977fc8f
Bump sidekiq from 5.2.3 to 5.2.5
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.3 to 5.2.5.
- [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/v5.2.3...v5.2.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-09 07:18:00 +00:00
Brandon Baker
a00ed5a176
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-08 12:03:39 -05:00
Brenda Wallace
fb02c187ab
Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
...
Conflicts:
.gitignore
2019-01-08 10:33:50 +13:00
Daniel O'Connor
ea2653ecfc
Merge pull request #1779 from Br3nda/ignore-extra-files
...
Switch to yarn && Ignore extra files
2019-01-06 15:41:51 +10:30
Brenda Wallace
99ac99b399
Can't update pip on travis, so don't
2019-01-06 16:19:58 +13:00
Brenda Wallace
97b377cf83
Add --no-document to install of linters
...
as suggested in https://github.com/brigade/overcommit/issues/610
2019-01-06 16:17:34 +13:00
Brenda Wallace
7c354c9872
Re-enable linters on Travis
2019-01-06 09:53:47 +13:00
Brenda Wallace
88ccdadeb1
Tidy up .gitignore
2019-01-06 09:53:47 +13:00
Brenda Wallace
798b4a8b47
Switching to yarn
2019-01-06 09:53:47 +13:00
Brenda Wallace
8cb9361462
only look up member/crop if an slug is passed
2019-01-06 08:45:42 +13:00
Brenda Wallace
c0e957b051
Places params is :place
2019-01-06 08:45:42 +13:00
Brenda Wallace
1660629cf9
DRY crop.interesting?
2019-01-06 08:45:42 +13:00
Brenda Wallace
4587dc711f
Use to_param to make parts of the csv filename
2019-01-06 08:45:42 +13:00
Brenda Wallace
061bd31220
Use owner param in filename
2019-01-06 08:45:42 +13:00
Brenda Wallace
df7a59c629
Use slug in filename, not name/login_name
2019-01-06 08:45:42 +13:00
Brenda Wallace
90386221bc
Update notification reply url in helper spec
2019-01-06 08:45:42 +13:00
Brenda Wallace
8846627096
Update notification controller spec to send notification_id
2019-01-06 08:45:42 +13:00
Brenda Wallace
106497c841
Rubocop fix ups
2019-01-06 08:45:42 +13:00
Brenda Wallace
fb5c631ec9
Fixed notification url in helper
2019-01-06 08:45:42 +13:00
Brenda Wallace
1e6c204df2
Rubcop fix up
2019-01-06 08:45:42 +13:00
Brenda Wallace
62a8f6b8d3
Fixed look up of reply notification
2019-01-06 08:45:42 +13:00
Brenda Wallace
0e0bf98c37
Specs for admin routing
2019-01-06 08:45:42 +13:00
Brenda Wallace
c2bcae47d2
Use the admin/members controller
2019-01-06 08:45:42 +13:00
Brenda Wallace
74e30aeb1d
move cms into admin scope
2019-01-06 08:45:42 +13:00
Brenda Wallace
bf6dd049ae
Fixed up admin routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
f8921d3ded
Update reply notifications
2019-01-06 08:45:42 +13:00
Brenda Wallace
f638b9a5da
Update path to member gardens in spec
2019-01-06 08:45:42 +13:00
Brenda Wallace
5528d9b5e9
Fix authors rss of posts link
2019-01-06 08:45:42 +13:00
Brenda Wallace
8b179ca2de
Add new routes to spec
2019-01-06 08:45:42 +13:00
Brenda Wallace
453bc0c6b4
Update crop route specs
2019-01-06 08:45:42 +13:00
Brenda Wallace
f008270ba2
Update spec for finding your own seeds
2019-01-06 08:45:42 +13:00
Brenda Wallace
e8d2226ac6
Look up crop by slug
2019-01-06 08:45:42 +13:00
Brenda Wallace
1381b619be
on collection, routes for notification
2019-01-06 08:45:42 +13:00
Brenda Wallace
71ac88789d
notification stays as member id
2019-01-06 08:45:42 +13:00
Brenda Wallace
686b7f27d0
Fixed paths in gardens feature spec
2019-01-06 08:45:42 +13:00
Brenda Wallace
dcbfc4f9fa
Fixed spec to look for new DRY header template in gardens
2019-01-06 08:45:42 +13:00
Brenda Wallace
b44b7fdd2e
Move follows from members controller to follows controller
2019-01-06 08:45:42 +13:00
Brenda Wallace
59bc036565
Follow/Unfollow updated for routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
9760c02b77
User owner's slug to filter seeds
2019-01-06 08:45:42 +13:00
Brenda Wallace
bbb403be49
Use slug to find a member
2019-01-06 08:45:42 +13:00
Brenda Wallace
0b11641003
Update params in charts/crops controller specs
2019-01-06 08:45:42 +13:00
Brenda Wallace
b92c2f9bae
Use slugs for look up in spec
2019-01-06 08:45:42 +13:00
Brenda Wallace
a219cc4f67
Update harvests controller spec for new routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
07f06705af
Fixed pi charts path
2019-01-06 08:45:42 +13:00
Brenda Wallace
ffb87a4432
Validators of garden name uniquness, and slug name
2019-01-06 08:45:42 +13:00
Brenda Wallace
32e7016b5b
Fixed link to your own seeds
2019-01-06 08:45:42 +13:00
Brenda Wallace
c969a9f830
Use slug, not member name, for urls to members
2019-01-06 08:45:42 +13:00
Brenda Wallace
b85a8551b5
Don't duplicate seed availability info on page
2019-01-06 08:45:42 +13:00
Brenda Wallace
42156dc9e9
Links to data by crop
2019-01-06 08:45:42 +13:00
Brenda Wallace
0a7137cae2
Fixed link to crop harvests
2019-01-06 08:45:42 +13:00
Brenda Wallace
abc796605d
Tidier path the member data
2019-01-06 08:45:42 +13:00
Brenda Wallace
b2bceb5873
Fixed planting display by crop
2019-01-06 08:45:42 +13:00
Brenda Wallace
1c44ef2192
Active/not active tick box on plantings#index
2019-01-06 08:45:42 +13:00
Brenda Wallace
cd98f38c5d
DRY the nav bars and make all the same
2019-01-06 08:45:42 +13:00
Brenda Wallace
e313a7160f
Active plantings option on plantings#index
2019-01-06 08:45:42 +13:00
Brenda Wallace
1e266a92f6
Members slug used in rotes
2019-01-06 08:45:42 +13:00
Brenda Wallace
387200abf7
Moving garden data under members
2019-01-06 08:45:42 +13:00
Brenda Wallace
57d53a5c0e
Fixed naming of member follows/following route
2019-01-06 08:45:42 +13:00
Brenda Wallace
99a69bf192
Tidy up places routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
7a09e20b71
Fixed admin routes. namespace, not a resource
2019-01-06 08:45:42 +13:00
Brenda Wallace
37cba79a52
Fixed newsletters route
2019-01-06 08:45:42 +13:00
Brenda Wallace
5a8bc73099
Simplify places routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
6167d02e66
Fixed path in auto suggest helper
2019-01-06 08:45:42 +13:00
Brenda Wallace
68953188f8
Update to new path names
2019-01-06 08:45:42 +13:00
Brenda Wallace
5d8352db08
DRY the routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
a65983e1ed
Routes for photos and owners
2019-01-06 08:45:42 +13:00
Brenda Wallace
3258694021
Tidy up the routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
a1e317e509
Merge pull request #1778 from Br3nda/fix/schema
...
Fix modified schema deploy error
2019-01-06 08:39:58 +13:00
Brenda Wallace
de8eba738e
Fix modified schema deploy error
2019-01-05 19:44:40 +13:00
Brenda Wallace
0f1ce681d2
Merge pull request #1773 from Growstuff/dependabot/bundler/chartkick-3.0.2
...
Bump chartkick from 3.0.1 to 3.0.2
2019-01-05 19:32:55 +13:00
dependabot[bot]
cecc032dee
Bump chartkick from 3.0.1 to 3.0.2
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.0.1 to 3.0.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.0.1...v3.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-04 10:12:16 +00:00
dependabot[bot]
fddfdf0107
Merge pull request #1774 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.4
2019-01-04 10:09:23 +00:00
Brenda Wallace
72be3e3a41
Merge branch 'dev' into UTFGardenNames
2019-01-04 23:06:43 +13:00
dependabot[bot]
cd43558120
Bump jsonapi-resources from 0.9.3 to 0.9.4
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.3 to 0.9.4.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.3...v0.9.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-04 09:24:41 +00:00
Brenda Wallace
db53d33ede
Merge branch 'dev' into photos/seeds
2019-01-04 22:22:51 +13:00
Brenda Wallace
8e3db87f4e
Merge pull request #1766 from Br3nda/upgrade/rails-5-2
...
Upgrade to Rails 5.2
2019-01-04 22:22:32 +13:00
Brenda Wallace
b13ddf9c92
Add photos of seeds
2019-01-04 22:21:48 +13:00
Brenda Wallace
efc8fb85cb
Merge branch 'dev' into upgrade/rails-5-2
2019-01-04 20:41:52 +13:00
Brenda Wallace
e9ead68e94
Revert "Auto corrected by following Format Javascript Code"
...
This reverts commit 334b33c555 .
2019-01-04 18:17:27 +13:00
Awesome Code
334b33c555
Auto corrected by following Format Javascript Code
2019-01-04 05:15:13 +00:00
Brenda Wallace
4218688d8e
Revert "Auto corrected by following Format Javascript Code"
...
This reverts commit f83a2b6397 .
2019-01-04 18:14:36 +13:00
Awesome Code
f83a2b6397
Auto corrected by following Format Javascript Code
2019-01-03 10:00:13 +00:00
dependabot[bot]
eae3755af7
Merge pull request #1770 from Growstuff/dependabot/bundler/rubocop-rspec-1.31.0
2019-01-03 09:59:47 +00:00
dependabot[bot]
273da44406
Bump rubocop-rspec from 1.30.1 to 1.31.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.30.1 to 1.31.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.30.1...v1.31.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-03 07:31:04 +00:00
Brenda Wallace
4374a4800b
Commenting out linter checks until overcommit is fixed
2019-01-03 14:44:35 +13:00
Brenda Wallace
12472d3762
Return to previous version
2019-01-03 14:41:11 +13:00
Brenda Wallace
7d7ae1f044
Pin to older childprocess
2019-01-03 14:19:45 +13:00
Brenda Wallace
84201c4f55
Pin to ruby 2.5.3 on linting
2019-01-03 14:12:27 +13:00
Brenda Wallace
8229c7196c
Don't install rubocop in linters. Use the one in the bundle
2019-01-03 13:50:30 +13:00
Brenda Wallace
3de23957a3
Updated package-lock for linters
2019-01-03 13:50:01 +13:00
Brenda Wallace
0971f3b5f4
Updated notification specs for Rails 5.2
2019-01-03 12:50:58 +13:00
Brenda Wallace
d89c8f0fbc
Merge branch 'dev' into upgrade/rails-5-2
2019-01-03 12:31:37 +13:00
Brenda Wallace
301023b713
Merge pull request #1768 from Br3nda/upgrade-heroku-stack
...
Upgrade heroku stack
2019-01-03 12:31:07 +13:00
Brenda Wallace
fd2717ee01
Merge branch 'dev' into upgrade-heroku-stack
2019-01-03 08:51:06 +13:00
Brenda Wallace
5a73f57454
Merge branch 'dev' into UTFGardenNames
2019-01-03 08:46:15 +13:00
Cesy
26198d90e4
Merge pull request #1767 from Br3nda/fix-mailer-from
...
Fix mailer from address
2019-01-02 09:07:15 +00:00
Brenda Wallace
28dcc57307
Set email env on travis runs
2019-01-01 14:10:04 +13:00
Brenda Wallace
1627c347e4
App.json to configure heroku
2019-01-01 14:07:51 +13:00
Brenda Wallace
6df2d92720
Adding from email to example application.yml
2019-01-01 13:59:32 +13:00
Brenda Wallace
a76f5d3a22
More locations with production email addresses
2019-01-01 13:56:08 +13:00
Brenda Wallace
f4df42d136
Fixes not being able to find the 404 page file
2019-01-01 13:42:53 +13:00
Brenda Wallace
c7ad7bcc70
Fixed redundant begin block
2019-01-01 13:38:37 +13:00
Brenda Wallace
47a4b02ce4
Merge remote-tracking branch 'upstream/dev' into dev
2019-01-01 13:36:41 +13:00
Brenda Wallace
164e43f054
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5-2
2019-01-01 13:32:57 +13:00
Brenda Wallace
b7f876429a
Upgrade to ruby 2.6.0
2019-01-01 13:31:09 +13:00
Cesy
f9aa6012aa
Merge pull request #1765 from Br3nda/fix/1764
...
Make mail sender host configurable
2018-12-31 23:29:28 +00:00
Brenda Wallace
a43c235423
Upgrade to Rails 5.2
2019-01-01 10:31:53 +13:00
Brenda Wallace
a6a75050bb
Make mail sender host configurable
2019-01-01 09:55:29 +13:00
Brenda Wallace
b18b397e1c
Merge pull request #1511 from Br3nda/upgrade/rails-5
...
Upgrade to rails 5
2019-01-01 08:45:52 +13:00
Brenda Wallace
73e9a94167
Merge remote-tracking branch 'upstream/dev' into dev
2018-12-31 23:19:42 +13:00
Brenda Wallace
e30b179bc8
Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5
2018-12-31 21:35:47 +13:00
Brenda Wallace
f6e065301f
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-12-31 21:35:19 +13:00
Brenda Wallace
188477206f
Merge branch 'dev' into upgrade/rails-5
2018-12-31 21:34:56 +13:00
Brenda Wallace
fb03923f75
Merge branch 'master' into dev
2018-12-31 21:33:05 +13:00
Brenda Wallace
04eb2c6448
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile.lock
2018-12-31 21:28:48 +13:00
dependabot[bot]
d6c9132049
Bump friendly_id from 5.2.4 to 5.2.5
...
Bumps [friendly_id](https://github.com/norman/friendly_id ) from 5.2.4 to 5.2.5.
- [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.2.4...5.2.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-31 21:27:06 +13:00
Brenda Wallace
f2fc6b2a61
Reduce max class complexity
2018-12-30 19:41:08 +13:00
Brenda Wallace
b70dee5041
Update rubocop todo
2018-12-30 19:37:28 +13:00
Brenda Wallace
9a88a9f7e0
Remove trailing whitespace
2018-12-30 17:00:47 +13:00
Brenda Wallace
ac660e986c
Wrap all action bar button groups in a div
...
So we can find them in specs
2018-12-30 16:14:00 +13:00
Brenda Wallace
c0f8c23976
Downgrade geocoder
2018-12-30 16:00:45 +13:00
Brenda Wallace
60f72652da
URI.escape -> CGI.escape
2018-12-30 15:55:10 +13:00
Brenda Wallace
2faa2fd6f0
Content for other formats on photos#show
2018-12-30 15:42:51 +13:00
Brenda Wallace
3f5c63eb04
URI.escape -> CGI.escape
2018-12-30 15:39:06 +13:00
Brenda Wallace
93e1c5e5fc
Disabled # rubocop:disable Rails/OutputSafety
2018-12-30 15:38:37 +13:00
Brenda Wallace
b1d2c46cff
Whitespace fixup
2018-12-30 15:34:31 +13:00
Brenda Wallace
b8fae99bde
Times with zone, in factories
2018-12-30 15:34:24 +13:00
Brenda Wallace
0083d1279a
Marked htmlsafe as # rubocob:ignore Rails/OutputSafety
2018-12-30 15:33:26 +13:00
Brenda Wallace
98e492ad11
DRY
2018-12-30 15:33:10 +13:00
Brenda Wallace
468dded162
Remove controller actions for method that don't exist
2018-12-30 15:32:59 +13:00
Brenda Wallace
7b01fcbd4b
Align all the hashes
2018-12-30 15:22:29 +13:00
Brenda Wallace
7399346354
one line method
2018-12-30 15:18:11 +13:00
Brenda Wallace
0330809e4b
Re-enable rubocop cops
2018-12-30 15:17:22 +13:00
Brenda Wallace
3fec343f2c
Rubocop for hash alignment
2018-12-30 15:13:59 +13:00
Brenda Wallace
22e456f3af
Time stamps need a timezone
2018-12-30 15:06:24 +13:00
Brenda Wallace
d5676338d6
Use the expect syntax
2018-12-30 15:06:14 +13:00
Brenda Wallace
9f90b0368b
Use %r for regexp
2018-12-30 15:06:06 +13:00
Brenda Wallace
ac6a308ea0
Update URL -> CGI
2018-12-30 15:05:41 +13:00
Brenda Wallace
914e9ef3be
photos needs a show method
2018-12-30 15:05:10 +13:00
Brenda Wallace
8e160a4c93
Fixed another wrong method name
2018-12-30 15:05:00 +13:00
Brenda Wallace
24b58c5ac2
FIXED wrong method name
2018-12-30 15:04:50 +13:00
Brenda Wallace
b82b4fa642
Comments controller has no show
2018-12-30 15:04:38 +13:00
Brenda Wallace
1e4cdc9511
Change rake to rails
2018-12-30 14:57:24 +13:00
Brenda Wallace
1574f4b90a
Downgrade active_median gem until we upgrade postgresql.
...
see #1757
2018-12-30 14:39:30 +13:00
Brenda Wallace
c2b64ffbc0
pull elastic search version back
2018-12-30 14:19:33 +13:00
Brenda Wallace
ca28812d83
No longer need to create the active median function in a migration
2018-12-30 13:49:50 +13:00
Brenda Wallace
007e61e76a
Freeze mutable objects assigned to constants.
2018-12-30 13:36:32 +13:00
Brenda Wallace
9e6f0af373
More things detected by rubocop, that we shouldn't ignore
2018-12-30 13:33:34 +13:00
Brenda Wallace
2cc37464fc
Some rubocop ignores that we shouldn't ignore
2018-12-30 13:31:33 +13:00
Brenda Wallace
27e471b7b3
Set rubocop to 0.60
2018-12-30 13:30:16 +13:00
Brenda Wallace
7e8aa7a435
bundle update
2018-12-30 13:22:52 +13:00
Brenda Wallace
0c78791d01
Remove unnecesary whitesapce in specs
2018-12-30 13:22:42 +13:00
Brenda Wallace
276accc314
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile.lock
2018-12-30 13:02:02 +13:00
Brenda Wallace
8348530e22
Tell capybara to normalise whitespace
2018-12-30 12:58:22 +13:00
Daniel O'Connor
5b7cdf2572
Merge branch 'dev' into bb-track-types-of-gardens
2018-12-27 09:14:06 +10:30
Daniel O'Connor
3df0e2da2b
Merge pull request #1750 from Growstuff/dependabot/bundler/newrelic_rpm-5.6.0.349
...
Bump newrelic_rpm from 5.5.0.348 to 5.6.0.349
2018-12-14 12:42:11 +10:30
dependabot[bot]
c8e625c45d
Bump newrelic_rpm from 5.5.0.348 to 5.6.0.349
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.5.0.348 to 5.6.0.349.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-13 07:50:43 +00:00
Brenda Wallace
f9d655034b
Merge branch 'dev' into bb-track-types-of-gardens
2018-12-12 09:37:52 +13:00
Brandon Baker
7b15ae319d
corrects more inflections
2018-12-12 09:37:31 +13:00
Brandon Baker
2c0746073e
removes extra empty line detected at block body end
2018-12-12 09:37:31 +13:00
Brandon Baker
c0450477c6
adds plural form of words with māori origin
2018-12-12 09:37:31 +13:00
Brandon Baker
e6007dc094
adds inflections for irregular plural crop names
2018-12-12 09:37:31 +13:00
dependabot[bot]
012cd75f5f
Bump letter_opener from 1.6.0 to 1.7.0
...
Bumps [letter_opener](https://github.com/ryanb/letter_opener ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases )
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-12 09:37:09 +13:00
Brandon Baker
178c6cd944
fixes bug in setting slug on container
2018-12-06 15:51:00 -07:00
dependabot[bot]
43f0cbe0ca
Bump pry from 0.12.0 to 0.12.2
...
Bumps [pry](https://github.com/pry/pry ) from 0.12.0 to 0.12.2.
- [Release notes](https://github.com/pry/pry/releases )
- [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md )
- [Commits](https://github.com/pry/pry/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-06 10:12:32 +13:00
dependabot[bot]
a91faecaa3
[Security] Bump rails from 4.2.10 to 4.2.11
...
Bumps [rails](https://github.com/rails/rails ) from 4.2.10 to 4.2.11. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v4.2.10...v4.2.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-06 10:08:47 +13:00
dependabot[bot]
e2c3c26edc
Bump active_utils from 3.3.13 to 3.3.15
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.13 to 3.3.15.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.13...v3.3.15 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-06 10:08:12 +13:00
Brandon Baker
bb97082868
adds friendly_id to containers
2018-12-01 19:46:49 -07:00
Brandon Baker
f35284c403
adds more basic specs
2018-12-01 14:08:11 -07:00
Brandon Baker
02174a0acb
builds views for containers
2018-11-30 11:56:58 -07:00
Brandon Baker
f5abc592f1
cleans up rubocop violations
2018-11-29 14:30:02 -07:00
Brandon Baker
5f6852b45c
adds basic specs for container and adds a plot spec for garden
2018-11-29 13:22:35 -07:00
Brandon Baker
c898a958a5
adds container to garden form
2018-11-29 12:51:15 -07:00
Brandon Baker
45ba5ff48a
creates containers, plots, and associations among gardens, plots, and containers
2018-11-29 10:54:04 -07:00
dependabot[bot]
11e8d1f702
Bump active_utils from 3.3.12 to 3.3.13
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.12 to 3.3.13.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.12...v3.3.13 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-27 21:36:30 +13:00
Brandon Baker
beab7fcfda
hides crop varieties that have not been approved
2018-11-26 17:29:27 +13:00
dependabot[bot]
6c6724b558
Bump guard from 2.14.2 to 2.15.0
...
Bumps [guard](https://github.com/guard/guard ) from 2.14.2 to 2.15.0.
- [Release notes](https://github.com/guard/guard/releases )
- [Changelog](https://github.com/guard/guard/blob/master/CHANGELOG.md )
- [Commits](https://github.com/guard/guard/compare/v2.14.2...v2.15.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-15 21:50:23 +13:00
dependabot[bot]
3506cf59de
Bump bullet from 5.8.1 to 5.9.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.8.1 to 5.9.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.8.1...5.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-13 15:15:29 +13:00
dependabot[bot]
825d8b6b3f
Bump pry from 0.11.3 to 0.12.0
...
Bumps [pry](https://github.com/pry/pry ) from 0.11.3 to 0.12.0.
- [Release notes](https://github.com/pry/pry/releases )
- [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md )
- [Commits](https://github.com/pry/pry/compare/v0.11.3...v0.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-10 10:42:29 +13:00
dependabot[bot]
0d183cee25
Bump newrelic_rpm from 5.4.0.347 to 5.5.0.348
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.4.0.347 to 5.5.0.348.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-10 10:41:56 +13:00
dependabot[bot]
5c45beb54f
Bump font-awesome-sass from 5.5.0 to 5.5.0.1
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.5.0 to 5.5.0.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.5.0...5.5.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
a051f4e06d
[Security] Bump rack from 1.6.10 to 1.6.11
...
Bumps [rack](https://github.com/rack/rack ) from 1.6.10 to 1.6.11. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/1.6.10...1.6.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
2c81429e1e
Bump font-awesome-sass from 5.4.1 to 5.5.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.4.1 to 5.5.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.4.1...5.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
a748fd9773
Bump selenium-webdriver from 3.14.1 to 3.141.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.14.1 to 3.141.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-3.141.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
977ddf301f
Bump dalli from 2.7.8 to 2.7.9
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.8 to 2.7.9.
- [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.8...v2.7.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
c38f9d8047
Bump rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1
...
Bumps rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
b45162caff
Bump bullet from 5.7.6 to 5.8.1
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.6 to 5.8.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
39d451240c
[Security] Bump loofah from 2.2.2 to 2.2.3
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [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.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
18b5792a31
Bump rspec-rails from 3.8.0 to 3.8.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
b80b6d2187
Bump capybara-screenshot from 1.0.21 to 1.0.22
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.21 to 1.0.22.
- [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.21...v1.0.22 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
235136523e
Bump codeclimate-test-reporter from 1.0.8 to 1.0.9
...
Bumps [codeclimate-test-reporter](https://github.com/codeclimate/ruby-test-reporter ) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/codeclimate/ruby-test-reporter/releases )
- [Changelog](https://github.com/codeclimate/ruby-test-reporter/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeclimate/ruby-test-reporter/compare/v1.0.8...v1.0.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
6aa77041ce
Bump jsonapi-resources from 0.9.0 to 0.9.3
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.0 to 0.9.3.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.0...v0.9.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
c5a58975e3
Bump cancancan from 2.2.0 to 2.3.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.2.0...2.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
c4849a2e3e
Bump platform-api from 2.1.0 to 2.2.0
...
Bumps [platform-api](https://github.com/heroku/platform-api ) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/heroku/platform-api/releases )
- [Commits](https://github.com/heroku/platform-api/compare/v2.1.0...v2.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
6be0486e59
Bump selenium-webdriver from 3.14.0 to 3.14.1
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.14.0 to 3.14.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
Awesome Code
ebe7cc3868
Auto corrected by following Ruby Style/UnneededCondition
2018-11-08 23:32:20 +13:00
dependabot[bot]
ec22039fc1
Bump rack-protection from 2.0.3 to 2.0.4
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.3...v2.0.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
2d10abcc59
Bump font-awesome-sass from 5.5.0 to 5.5.0.1
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.5.0 to 5.5.0.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.5.0...5.5.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 22:27:57 +13:00
dependabot[bot]
832ec2e15e
[Security] Bump rack from 1.6.10 to 1.6.11
...
Bumps [rack](https://github.com/rack/rack ) from 1.6.10 to 1.6.11. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/1.6.10...1.6.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-07 08:33:36 +13:00
dependabot[bot]
709d188004
Bump font-awesome-sass from 5.4.1 to 5.5.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.4.1 to 5.5.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.4.1...5.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-06 08:53:58 +13:00
dependabot[bot]
d5dff62b48
Bump selenium-webdriver from 3.14.1 to 3.141.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.14.1 to 3.141.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-3.141.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-04 01:15:49 +13:00
dependabot[bot]
d290c8bf90
Merge pull request #1722 from Growstuff/dependabot/bundler/dalli-2.7.9
2018-10-31 10:01:29 +00:00
dependabot[bot]
ea286e8300
Bump dalli from 2.7.8 to 2.7.9
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.8 to 2.7.9.
- [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.8...v2.7.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-31 09:47:09 +00:00
dependabot[bot]
3a75e69459
Merge pull request #1720 from Growstuff/dependabot/bundler/rails-assets-leaflet.markercluster-1.4.1
2018-10-31 09:43:39 +00:00
dependabot[bot]
d0ce89a9a5
Bump rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1
...
Bumps rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-31 09:20:19 +00:00
dependabot[bot]
37a3e9e9e1
Bump bullet from 5.7.6 to 5.8.1
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.6 to 5.8.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-31 22:16:38 +13:00
dependabot[bot]
825883b323
[Security] Bump loofah from 2.2.2 to 2.2.3
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [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.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-31 09:54:56 +13:00
dependabot[bot]
77f5bcffb0
Bump rspec-rails from 3.8.0 to 3.8.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-25 11:59:50 +13:00
dependabot[bot]
122daca7d6
Bump capybara-screenshot from 1.0.21 to 1.0.22
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.21 to 1.0.22.
- [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.21...v1.0.22 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-23 12:19:16 +13:00
Brenda Wallace
a635032df1
Merge branch 'master' into dev
2018-10-21 16:09:01 +13:00
dependabot[bot]
09c529a6ef
Bump codeclimate-test-reporter from 1.0.8 to 1.0.9
...
Bumps [codeclimate-test-reporter](https://github.com/codeclimate/ruby-test-reporter ) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/codeclimate/ruby-test-reporter/releases )
- [Changelog](https://github.com/codeclimate/ruby-test-reporter/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeclimate/ruby-test-reporter/compare/v1.0.8...v1.0.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 08:25:19 +13:00
dependabot[bot]
014b887a1f
Bump jsonapi-resources from 0.9.0 to 0.9.3
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.0 to 0.9.3.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.0...v0.9.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 08:24:57 +13:00
dependabot[bot]
10f7c864ab
Bump cancancan from 2.2.0 to 2.3.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.2.0...2.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 08:19:33 +13:00
dependabot[bot]
c6b38105af
Bump platform-api from 2.1.0 to 2.2.0
...
Bumps [platform-api](https://github.com/heroku/platform-api ) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/heroku/platform-api/releases )
- [Commits](https://github.com/heroku/platform-api/compare/v2.1.0...v2.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 08:19:07 +13:00
dependabot[bot]
f02c1d80be
Bump selenium-webdriver from 3.14.0 to 3.14.1
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.14.0 to 3.14.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 08:18:45 +13:00
Awesome Code
a818a2ad45
Auto corrected by following Ruby Style/UnneededCondition
2018-10-20 06:57:51 +13:00
dependabot[bot]
23525371d9
Bump rack-protection from 2.0.3 to 2.0.4
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/sinatra/sinatra/releases )
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.3...v2.0.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:57 +13:00
dependabot[bot]
0694d37916
Bump factory_bot_rails from 4.10.0 to 4.11.1
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 4.10.0 to 4.11.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.10.0...v4.11.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
ea30f5b7b3
Bump bullet from 5.7.5 to 5.7.6
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
0c36ea4fef
Bump devise from 4.4.3 to 4.5.0
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
4a91bd977f
Bump rspec-activemodel-mocks from 1.0.3 to 1.1.0
...
Bumps [rspec-activemodel-mocks](https://github.com/rspec/rspec-activemodel-mocks ) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/rspec/rspec-activemodel-mocks/releases )
- [Commits](https://github.com/rspec/rspec-activemodel-mocks/compare/v1.0.3...v1.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
fdf4defb46
Bump font-awesome-sass from 5.0.13 to 5.4.1
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.0.13 to 5.4.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.13...5.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
cfcbd10844
Bump ruby-units from 2.3.0 to 2.3.1
...
Bumps [ruby-units](https://github.com/olbrich/ruby-units ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/olbrich/ruby-units/releases )
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt )
- [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
22787fa994
Bump sidekiq from 5.2.1 to 5.2.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.1 to 5.2.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/v5.2.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
Ahmed Shahin
f73cc7f213
Add my name to contributors list
2018-10-20 06:56:19 +13:00
Ahmed Shahin
4b6de08181
Provide message to raise_error
2018-10-20 06:56:19 +13:00
dependabot[bot]
900d51828d
Bump chartkick from 2.3.5 to 3.0.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 2.3.5 to 3.0.1.
- [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/v2.3.5...v3.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
89b475940f
Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.2.0.345 to 5.4.0.347.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
d9e7c9a831
Bump factory_bot_rails from 4.10.0 to 4.11.1
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 4.10.0 to 4.11.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.10.0...v4.11.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-19 17:00:03 +13:00
dependabot[bot]
0e4005897e
Bump bullet from 5.7.5 to 5.7.6
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-19 16:59:37 +13:00
dependabot[bot]
1c852d992e
Merge pull request #1688 from Growstuff/dependabot/bundler/devise-4.5.0
2018-10-18 09:34:55 +00:00
dependabot[bot]
c9084618d0
Bump devise from 4.4.3 to 4.5.0
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-18 09:08:22 +00:00
dependabot[bot]
5021061523
Bump rspec-activemodel-mocks from 1.0.3 to 1.1.0
...
Bumps [rspec-activemodel-mocks](https://github.com/rspec/rspec-activemodel-mocks ) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/rspec/rspec-activemodel-mocks/releases )
- [Commits](https://github.com/rspec/rspec-activemodel-mocks/compare/v1.0.3...v1.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-18 22:05:35 +13:00
dependabot[bot]
6e0687c2c3
Bump font-awesome-sass from 5.0.13 to 5.4.1
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.0.13 to 5.4.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.13...5.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-18 15:50:56 +13:00
dependabot[bot]
2f34846c66
Bump ruby-units from 2.3.0 to 2.3.1
...
Bumps [ruby-units](https://github.com/olbrich/ruby-units ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/olbrich/ruby-units/releases )
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt )
- [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-18 14:20:14 +13:00
Brenda Wallace
cf11cbd7d2
Update seeds specs
2018-10-16 15:11:46 +13:00
Brenda Wallace
ac8dff2a28
Update new post spec
2018-10-16 14:29:44 +13:00
Brenda Wallace
918f73d0f0
Update crop edit spec
2018-10-16 14:29:01 +13:00
Brenda Wallace
fb156ec438
Updating edit seeds spec
2018-10-16 14:20:15 +13:00
Brenda Wallace
92939ca204
Spec updates
2018-10-16 14:08:37 +13:00
Brenda Wallace
ec4c6f13aa
Updating new seed view specs
2018-10-16 13:56:10 +13:00
Brenda Wallace
510124758d
Inverse relation ships
2018-10-16 13:26:54 +13:00
Brenda Wallace
de2175ce16
More inverse relationships defined
2018-10-16 13:20:03 +13:00
Brenda Wallace
0d3588a2b2
Add another inverse_of created_alternate_names
2018-10-16 12:47:05 +13:00
Brenda Wallace
03da26f949
Upgrade nokogiri
2018-10-16 12:45:18 +13:00
Brenda Wallace
c1dabfc3d3
Typo fix, requestd_crops to requested_crops
2018-10-16 12:42:49 +13:00
Brenda Wallace
0a65e57d53
Fixed up text in spec
2018-10-16 12:42:15 +13:00
Brenda Wallace
fc0a941fb6
Adding more inverse relationships
2018-10-16 11:32:03 +13:00
Brenda Wallace
0862f34ff3
Merge branch 'dev' into upgrade/rails-5
2018-10-16 10:31:23 +13:00
Brenda Wallace
6c2afb2804
Adding missing inverswe relationship alternatename.creator
2018-10-16 10:16:45 +13:00
Brenda Wallace
bcb466dbf1
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile.lock
spec/controllers/photos_controller_spec.rb
2018-10-16 09:46:14 +13:00
Brenda Wallace
d594e19448
Merge branch 'master' into dev
2018-10-16 09:30:14 +13:00
dependabot[bot]
e4f130fa48
Merge pull request #1705 from Growstuff/dependabot/bundler/sidekiq-5.2.2
2018-10-15 20:10:38 +00:00
dependabot[bot]
42f05a0f3e
Bump sidekiq from 5.2.1 to 5.2.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.1 to 5.2.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/v5.2.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-10 08:22:23 +00:00
pozorvlak
cdf9be3590
Merge pull request #1704 from codeminator/fix-warning-in-photos-controller-spec
...
Fix Warning in specs: PhotoController
2018-10-10 09:19:33 +01:00
pozorvlak
b5347039c0
Merge branch 'dev' into fix-warning-in-photos-controller-spec
2018-10-10 08:38:18 +01:00
pozorvlak
734f97a3eb
Merge pull request #1687 from Growstuff/dependabot/bundler/chartkick-3.0.1
...
Bump chartkick from 2.3.5 to 3.0.1
2018-10-10 08:37:13 +01:00
pozorvlak
e5ef2df518
Merge branch 'dev' into fix-warning-in-photos-controller-spec
2018-10-10 08:34:23 +01:00
Ahmed Shahin
5dde5610eb
Add my name to contributors list
2018-10-10 08:46:28 +02:00
Ahmed Shahin
ac535d32e8
Provide message to raise_error
2018-10-10 08:42:05 +02:00
Brenda Wallace
7a44e9499d
More markup updates to fit specs
2018-10-08 14:18:19 +13:00
Brenda Wallace
aded3c00fc
More spec updates
2018-10-08 14:17:28 +13:00
Brenda Wallace
fe2536c864
More spec updates
2018-10-08 14:15:44 +13:00
Brenda Wallace
1e7e275684
Adding inverse relationships (except for photos)
2018-10-08 13:43:09 +13:00
Brenda Wallace
74a71be69f
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile.lock
2018-10-08 13:33:54 +13:00
Brenda Wallace
05da2de7e4
Fix up text in checking appended date
2018-10-08 09:48:49 +13:00
Brenda Wallace
fb2f5f464a
Change scenario to description
2018-10-08 09:47:52 +13:00
dependabot[bot]
71badfbc3c
Bump chartkick from 2.3.5 to 3.0.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 2.3.5 to 3.0.1.
- [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/v2.3.5...v3.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-07 08:42:58 +00:00
Brenda Wallace
be7767619c
Merge pull request #1702 from Growstuff/dependabot/bundler/newrelic_rpm-5.4.0.347
...
Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
2018-10-07 21:40:04 +13:00
Brenda Wallace
0390428bcf
Merge pull request #1701 from Growstuff/dev
...
Release to production
2018-10-07 21:39:27 +13:00
dependabot[bot]
d05569fc27
Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.2.0.345 to 5.4.0.347.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-05 02:53:14 +00:00
Brenda Wallace
4690fb4364
Merge pull request #1700 from Growstuff/dependabot/bundler/nokogiri-1.8.5
...
[Security] Bump nokogiri from 1.8.4 to 1.8.5
2018-10-05 15:51:10 +13:00
dependabot[bot]
4bdcb782d9
[Security] Bump nokogiri from 1.8.4 to 1.8.5
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.4...v1.8.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-05 02:37:04 +00:00
Brenda Wallace
1bb70d4bcd
Ordering gems
2018-09-29 15:55:07 +12:00
Brenda Wallace
cd1bf8c268
Code style fix up
2018-09-29 15:53:06 +12:00
Brenda Wallace
9694696570
Code style fix ups
2018-09-29 15:52:42 +12:00
Brenda Wallace
d1d1a61be3
Added inverse to model
2018-09-29 15:52:32 +12:00
Brenda Wallace
5031b37232
Adding \n into specs, because our output has it now
2018-09-29 15:51:35 +12:00
Brenda Wallace
b3ecdb0ae5
Removed include in rubocop, was making rubocop not check files
2018-09-13 23:16:16 +12:00
Brenda Wallace
e2874404e4
Layout linter fix
2018-09-13 23:15:01 +12:00
Brenda Wallace
7c7d261e7e
Fixed last static factorybot attribtue
2018-09-13 23:13:03 +12:00
Brenda Wallace
3ad048b7e8
Fixed linter issue, empty line after guard clause
2018-09-13 23:10:43 +12:00
Brenda Wallace
ee49e8c5db
Fixing unneeded condition
2018-09-13 23:09:13 +12:00
Brenda Wallace
c16ee81c88
Add rubocop-rspec
2018-09-13 22:51:42 +12:00
Brenda Wallace
99a9c0817d
Lint fix
2018-09-13 22:51:22 +12:00
Brenda Wallace
0359655842
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-09-13 22:46:20 +12:00
Brenda Wallace
aad7128a31
Fixed user name generation in member factorybot
2018-09-13 22:44:46 +12:00
Brenda Wallace
f52acd5282
Adding puma to gem bundle
2018-09-13 22:44:32 +12:00
Brenda Wallace
ca0ad08923
Merge remote-tracking branch 'upstream/dev' into dev
2018-09-13 22:39:39 +12:00
Brenda Wallace
ea67df0da3
Added dependabot to contributors again
2018-09-12 10:59:13 +12:00
dependabot[bot]
8a3fcf7939
Merge pull request #1686 from Growstuff/dependabot/bundler/sidekiq-5.2.1
2018-09-11 05:00:52 +00:00
dependabot[bot]
b69759754f
Bump sidekiq from 5.1.3 to 5.2.1
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.1.3 to 5.2.1.
- [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/v5.1.3...v5.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-11 04:12:12 +00:00
Brenda Wallace
ae48bd0564
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-09-11 16:08:15 +12:00
Brenda Wallace
550860178e
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-09-11 16:07:30 +12:00
Brenda Wallace
914c981a1d
Merge pull request #1690 from Growstuff/dependabot/bundler/rubyzip-1.2.2
...
[Security] Bump rubyzip from 1.2.1 to 1.2.2
2018-09-11 16:06:46 +12:00
Brenda Wallace
ef60f74624
Removed extra blank lines
2018-09-11 15:57:09 +12:00
Brenda Wallace
9ee0846a30
Merge remote-tracking branch 'upstream/master' into dependabot/bundler/rubyzip-1.2.2
2018-09-11 15:56:07 +12:00
Brenda Wallace
fb4dca03d2
Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2
2018-09-11 15:51:03 +12:00
Awesome Code
d248f99209
Auto corrected by following Ruby rspec layout
2018-09-11 03:29:48 +00:00
Awesome Code
7301c6cd6c
Auto corrected by following Ruby RSpec/HooksBeforeExamples
2018-09-11 03:02:54 +00:00
Brenda Wallace
a5bb24b2a8
Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2
2018-09-11 14:50:57 +12:00
Brenda Wallace
189d2b49a6
Merge pull request #1647 from Growstuff/dev
...
Release 47
2018-09-11 10:23:11 +12:00
Awesome Code
34470a8457
Auto corrected by following Ruby Layout/LeadingBlankLines
2018-09-10 22:20:20 +00:00
Awesome Code
90f4db4853
Auto corrected by following Ruby rspec layout
2018-09-10 22:20:12 +00:00
Brenda Wallace
a9d463e9be
Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2
2018-09-11 08:06:59 +12:00
pozorvlak
28503cdca0
Merge pull request #1696 from Growstuff/awesomecode-ruby/factorybot/attributedefinedstatically-22693
...
Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically
2018-09-10 10:48:20 +01:00
Awesome Code
31744491ea
Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically
2018-09-09 21:53:57 +00:00
dependabot[bot]
4ec327f705
[Security] Bump rubyzip from 1.2.1 to 1.2.2
...
Bumps [rubyzip](https://github.com/rubyzip/rubyzip ) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [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.1...v1.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-09 08:35:44 +00:00
Cesy
d541f795f6
Merge pull request #1694 from Br3nda/upgrade/elasticsearch
...
Upgrade/elasticsearch
2018-09-09 09:33:09 +01:00
Brenda Wallace
03837e193e
Test coverage
2018-09-09 14:25:40 +12:00
Brenda Wallace
612bfcffcb
Adding codeclimate to env
2018-09-09 13:48:17 +12:00
Brenda Wallace
d0b785bcd3
Pass elasticsearch version from travis.yaml
2018-09-09 13:33:20 +12:00
Brenda Wallace
857c9e9d7a
whitespace fixups
2018-09-09 12:44:52 +12:00
Brenda Wallace
913ac45127
Changed query syntax for elasticsearch
2018-09-09 12:40:40 +12:00
Brenda Wallace
27c4dbedf2
Elasticsearch has dropped the string type and is now using text
2018-09-09 12:18:50 +12:00
Brenda Wallace
4867c68984
Added stdout print when creating/refreshing elasticsearch index
2018-09-09 12:11:10 +12:00
Brenda Wallace
a326f92210
Move elastic search index create to same line as db:create
2018-09-09 11:59:50 +12:00
Brenda Wallace
835e277f49
whitepace fix up
2018-09-09 11:58:43 +12:00
Brenda Wallace
7197843ac3
Reindex elasticsearch rake task
2018-09-09 11:56:37 +12:00
Brenda Wallace
ea1fb90279
Create the search index
2018-09-09 11:55:19 +12:00
Brenda Wallace
53b08422ce
Force new config when installing elasticsearch
2018-09-09 11:08:34 +12:00
Brenda Wallace
a051523354
Upgrade to elasticsearch 6.2.3
2018-09-09 10:56:21 +12:00
Brenda Wallace
5563b183dc
Revert "Remove custom elastic search installer in travis"
...
This reverts commit d629203570 .
2018-09-09 10:52:20 +12:00
Brenda Wallace
69f6c8d5de
Merge branch 'dev' into upgrade/elasticsearch
2018-09-09 10:04:19 +12:00
Brenda Wallace
f69f0861d2
Style fix up
2018-09-09 10:04:02 +12:00
Brenda Wallace
9a0fa34c0a
Style fix up
2018-09-09 09:55:43 +12:00
Brenda Wallace
d629203570
Remove custom elastic search installer in travis
2018-09-09 09:44:43 +12:00
Brenda Wallace
338e705db7
Upgrade elastic search gems
2018-09-09 09:44:27 +12:00
dependabot[bot]
dfc53747d9
Bump unicorn from 5.4.0 to 5.4.1
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.4.0 to 5.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-07 11:45:52 +12:00
brenda
2b8aac19dd
Revert "Auto corrected by following Ruby Capybara/FeatureMethods"
...
This reverts commit b52763b7c2 .
2018-09-07 10:40:09 +12:00
Awesome Code
b52763b7c2
Auto corrected by following Ruby Capybara/FeatureMethods
2018-09-05 12:06:58 +00:00
dependabot[bot]
45fcb76f30
Merge pull request #1681 from Growstuff/dependabot/bundler/selenium-webdriver-3.14.0
2018-08-07 09:25:36 +00:00
dependabot[bot]
b5c55f42b8
Bump selenium-webdriver from 3.13.0 to 3.14.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.13.0...selenium-3.14.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-07 09:07:48 +00:00
dependabot[bot]
53ddb4ef94
Bump rspec-rails from 3.7.2 to 3.8.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.7.2 to 3.8.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-07 21:05:39 +12:00
dependabot[bot]
4147a571a5
Merge pull request #1668 from Growstuff/dependabot/bundler/active_utils-3.3.12
2018-08-06 11:36:17 +00:00
dependabot[bot]
02f4c7f3ac
Bump active_utils from 3.3.11 to 3.3.12
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.11 to 3.3.12.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.11...v3.3.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-06 08:18:44 +00:00
dependabot[bot]
329f77db78
Bump factory_bot_rails from 4.8.2 to 4.10.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 4.8.2 to 4.10.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.8.2...v4.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-06 20:15:13 +12:00
Awesome Code
345fac4358
Auto corrected by following Ruby FactoryBot/StaticAttributeDefinedDynamically
2018-07-21 04:04:00 +00:00
dependabot[bot]
409f24e4e5
Merge pull request #1658 from Growstuff/dependabot/bundler/capybara-screenshot-1.0.21
2018-07-16 09:39:00 +00:00
dependabot[bot]
5dd22d8d1c
Bump capybara-screenshot from 1.0.19 to 1.0.21
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.19 to 1.0.21.
- [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.19...v1.0.21 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-16 09:25:22 +00:00
dependabot[bot]
dbbd7fdeb4
Bump uglifier from 4.1.14 to 4.1.15
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.14 to 4.1.15.
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.14...v4.1.15 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-16 21:23:32 +12:00
Brenda Wallace
3c4e1423f9
Merge pull request #1659 from Growstuff/dependabot/bundler/geocoder-1.4.9
...
Bump geocoder from 1.4.7 to 1.4.9
2018-07-15 08:50:20 +12:00
Brenda Wallace
a260aa788a
Merge branch 'dev' into UTFGardenNames
2018-07-12 20:27:40 +12:00
dependabot[bot]
40600215bc
Bump geocoder from 1.4.7 to 1.4.9
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.4.7 to 1.4.9.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.4.7...v1.4.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-12 08:25:38 +00:00
Brenda Wallace
0bdf42f6c8
Merge pull request #1669 from Growstuff/dependabot/bundler/faker-1.9.1
...
Bump faker from 1.8.7 to 1.9.1
2018-07-12 20:23:20 +12:00
dependabot[bot]
711fb28f49
Bump faker from 1.8.7 to 1.9.1
...
Bumps [faker](https://github.com/stympy/faker ) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-12 07:25:39 +00:00
Brenda Wallace
77f14feae5
Merge pull request #1656 from Growstuff/dependabot/bundler/font-awesome-sass-5.0.13
...
Bump font-awesome-sass from 5.0.9 to 5.0.13
2018-07-04 13:12:36 +12:00
dependabot[bot]
1b6bbfcfac
Bump font-awesome-sass from 5.0.9 to 5.0.13
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.0.9 to 5.0.13.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.9...5.0.13 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-03 22:13:14 +00:00
Brenda Wallace
d39af973e0
Merge pull request #1663 from Growstuff/dependabot/bundler/uglifier-4.1.14
...
Bump uglifier from 4.1.13 to 4.1.14
2018-07-04 10:11:34 +12:00
dependabot[bot]
14dd8bbc8b
Bump uglifier from 4.1.13 to 4.1.14
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.13 to 4.1.14.
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.13...v4.1.14 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-03 21:03:20 +00:00
Brenda Wallace
72753c2d43
Merge pull request #1660 from Growstuff/dependabot/bundler/chartkick-2.3.5
...
Bump chartkick from 2.3.4 to 2.3.5
2018-07-04 09:01:36 +12:00
Brenda Wallace
b1854bbd4a
Following same syntax in contributors.md
2018-07-04 08:35:14 +12:00
Brenda Wallace
709cd640d2
Adding dependabot-bot and dependabot.
2018-07-04 08:34:34 +12:00
Brenda Wallace
9e7c6584a6
Turning off BundleOutdated in overcommit
2018-07-04 08:27:11 +12:00
dependabot[bot]
1211be2fef
Bump chartkick from 2.3.4 to 2.3.5
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 2.3.4 to 2.3.5.
- [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/v2.3.4...v2.3.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-03 10:46:22 +00:00
Brenda Wallace
d712b440b4
Merge pull request #1650 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-1.12.11
...
Bump comfortable_mexican_sofa from 1.12.10 to 1.12.11
2018-07-03 22:44:10 +12:00
Brenda Wallace
517cfd85e5
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-03 22:03:58 +12:00
Brenda Wallace
7030c868b6
Fixing deoendabot
2018-07-03 22:01:34 +12:00
Brenda Wallace
d8b39c69ec
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-03 21:01:21 +12:00
Brenda Wallace
e7e997290e
Fixed dependabot username
2018-07-03 20:52:24 +12:00
Daniel O'Connor
5d88b65284
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-02 15:25:39 +09:30
Daniel O'Connor
31d97f4c00
Merge pull request #1653 from Growstuff/dependabot/bundler/newrelic_rpm-5.2.0.345
...
Bump newrelic_rpm from 5.0.0.342 to 5.2.0.345
2018-07-02 15:24:22 +09:30
Daniel O'Connor
ec9f57e6b8
Merge pull request #1649 from Growstuff/dependabot/bundler/selenium-webdriver-3.13.0
...
Bump selenium-webdriver from 3.11.0 to 3.13.0
2018-07-02 15:23:53 +09:30
Daniel O'Connor
dd0e9f74e6
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-02 13:20:41 +09:30
Daniel O'Connor
9d389726f5
Merge branch 'dev' into dependabot/bundler/newrelic_rpm-5.2.0.345
2018-07-02 12:44:26 +09:30
Daniel O'Connor
4fd0096c85
Merge pull request #1651 from Growstuff/dependabot/bundler/rack-protection-2.0.3
...
Bump rack-protection from 2.0.1 to 2.0.3
2018-07-02 12:44:02 +09:30
Daniel O'Connor
28945b6f20
Merge pull request #1652 from Growstuff/dependabot/bundler/uglifier-4.1.13
...
Bump uglifier from 4.1.10 to 4.1.13
2018-07-02 12:40:59 +09:30
Daniel O'Connor
b926f07e2a
Update CONTRIBUTORS.md
2018-07-02 12:39:59 +09:30
Daniel O'Connor
b10719ecab
Merge branch 'dev' into dependabot/bundler/selenium-webdriver-3.13.0
2018-07-02 09:47:13 +09:30
Daniel O'Connor
1527fec441
Merge branch 'dev' into dependabot/bundler/uglifier-4.1.13
2018-07-02 09:46:59 +09:30
Daniel O'Connor
1096fd0e89
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-02 09:46:39 +09:30
Daniel O'Connor
0cde6ad684
Merge branch 'dev' into dependabot/bundler/newrelic_rpm-5.2.0.345
2018-07-02 09:46:25 +09:30
Daniel O'Connor
8b4951c71a
Merge branch 'dev' into dependabot/bundler/rack-protection-2.0.3
2018-07-02 09:46:08 +09:30
Daniel O'Connor
8fe3b1da15
Update CONTRIBUTORS.md
2018-07-02 09:44:50 +09:30
dependabot[bot]
d2c81d6b29
Bump newrelic_rpm from 5.0.0.342 to 5.2.0.345
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.0.0.342 to 5.2.0.345.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-01 11:55:29 +00:00
dependabot[bot]
5ad44c10af
Bump uglifier from 4.1.10 to 4.1.13
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.10 to 4.1.13.
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.10...v4.1.13 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-01 11:54:50 +00:00
dependabot[bot]
008537a324
Bump rack-protection from 2.0.1 to 2.0.3
...
Bumps [rack-protection](http://www.sinatrarb.com/protection/ ) from 2.0.1 to 2.0.3.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-01 11:52:31 +00:00
dependabot[bot]
116a9a8bab
Bump comfortable_mexican_sofa from 1.12.10 to 1.12.11
...
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa ) from 1.12.10 to 1.12.11.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases )
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-01 11:51:52 +00:00
dependabot[bot]
dc7cbadfc0
Bump selenium-webdriver from 3.11.0 to 3.13.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.11.0 to 3.13.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.11.0...selenium-3.13.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-01 11:50:30 +00:00
Brenda Wallace
1c7a3e27d9
Merge pull request #1648 from Growstuff/dependabot/bundler/sprockets-3.7.2
...
[Security] Bump sprockets from 3.7.1 to 3.7.2
2018-06-25 15:59:59 +12:00
dependabot[bot]
e66924151a
[Security] Bump sprockets from 3.7.1 to 3.7.2
...
Bumps [sprockets](http://getsprockets.org/ ) from 3.7.1 to 3.7.2. **This update includes security fixes.**
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-06-25 03:31:45 +00:00
Brenda Wallace
6f1eed06cc
Merge pull request #1646 from robotscissors/issue-565-create-harvests-rss
...
Issue 565 create harvests RSS
2018-06-19 10:52:10 +12:00
robotscissors
605e2e1392
Add to contributors file
2018-06-18 15:22:27 -07:00
Brenda Wallace
9b6db4cde7
Merge branch 'dev' into upgrade/rails-5
2018-06-17 20:59:49 +12:00
Brenda Wallace
19fa8bb167
Merge branch 'dev' into UTFGardenNames
2018-06-17 20:58:54 +12:00
Brenda Wallace
77d2dc6144
Merge branch 'dev' into issue-565-create-harvests-rss
2018-06-17 20:58:32 +12:00
Brenda Wallace
678dabf710
Merge branch 'master' into dev
2018-06-17 10:42:55 +12:00
Brenda Wallace
3a7be86ef9
Merge pull request #1607 from Br3nda/fix/plants-parts-dupe
...
Don't allow duplicate plant parts names
2018-06-17 10:42:14 +12:00
Brenda Wallace
a8ab21d3bc
Merge branch 'dev' into upgrade/rails-5
2018-06-17 08:48:25 +12:00
Brenda Wallace
a5fa69c7c7
Merge branch 'dev' into fix/plants-parts-dupe
2018-06-17 08:47:27 +12:00
Brenda Wallace
1d8c2db674
Merge branch 'dev' into issue-565-create-harvests-rss
2018-06-17 08:47:12 +12:00
Cesy
945edd1cbc
Merge pull request #1644 from Br3nda/fix/reminder-email-ordering
...
Order plantings and harvests in email
2018-06-16 21:37:29 +01:00
Brenda Wallace
f67d39ed63
Merge branch 'dev' into issue-565-create-harvests-rss
2018-06-16 07:53:38 +12:00
Brenda Wallace
103d7375d3
Merge branch 'dev' into fix/plants-parts-dupe
2018-06-16 07:52:51 +12:00
Brenda Wallace
3b2c4a7893
Merge branch 'dev' into fix/reminder-email-ordering
2018-06-16 07:49:06 +12:00
Brenda Wallace
ecf2e82e9e
Merge pull request #1645 from Growstuff/Br3nda-patch-1
...
Pin coverage badge to dev branch
2018-06-16 07:48:36 +12:00
robotscissors
82b83ca7a4
Fix linter issues
2018-06-12 10:00:45 -07:00
robotscissors
e784790e19
add .to_s to accomodate hound
2018-06-11 11:16:47 -07:00
robotscissors
f9bdae77d3
add tests for harvests/index.rss
2018-06-11 10:38:26 -07:00
robotscissors
dff6827761
create rss feed for harvests
2018-06-10 20:38:43 -07:00
Brenda Wallace
2f65939d5c
Pin coverage badge to dev branch
2018-06-10 11:47:15 +12:00
Brenda Wallace
d7e71c8fc3
Use factory bot to make a harvest.plant_part
2018-06-07 11:46:29 +12:00
Brenda Wallace
47ddc915ef
Generate random number in plant_part.name in factorybot
2018-06-07 11:44:29 +12:00
Brenda Wallace
0d303ee6df
Don't allow duplicate plant parts names
...
Make factort's plant_part.name unique
Setting plant_part.name in specs
Unique names for plant parts
2018-06-04 17:42:41 +12:00
Brenda Wallace
5dc8bc5ec5
Order plantings and harvests in email
2018-06-04 17:35:06 +12:00
Brenda Wallace
0f8747f03d
Turn on the CMS specs again
2018-06-04 17:13:00 +12:00
Brenda Wallace
3399a794b2
Ignore one non-ascii comment
2018-06-04 16:55:29 +12:00
Brenda Wallace
cf72bdc57d
Reinstate json response config
2018-06-04 16:49:41 +12:00
Brenda Wallace
48589150a7
Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5
2018-06-04 16:49:27 +12:00
Brenda Wallace
1f6d76445e
Added back CMS initialiser
2018-06-04 16:49:00 +12:00
Brenda Wallace
a816ec2bba
Fix up footer
2018-06-04 16:44:51 +12:00
Brenda Wallace
f31ff5d508
Removed commented out gems
2018-06-04 16:42:37 +12:00
Brenda Wallace
7737f41b7f
Code style fixup
2018-06-04 16:39:51 +12:00
Brenda Wallace
fd405ccad0
Added back link to CMS
2018-06-04 16:37:57 +12:00
Brenda Wallace
4be4e96a9f
Fixed or => ||
2018-06-04 16:30:38 +12:00
Brenda Wallace
4d937a1f91
Restoring Comfy mexican sofa
2018-06-04 16:29:38 +12:00
Brenda Wallace
326e972e9b
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-06-04 16:21:51 +12:00
Brenda Wallace
f58c6c8f54
Regen rubocop todo
2018-06-04 16:20:39 +12:00
Brenda Wallace
05bfbda5f5
Rubocop style fix ups
2018-06-04 16:18:49 +12:00
Brenda Wallace
d7cc219569
Unique login_name in member factory
2018-06-04 16:16:55 +12:00
Brenda Wallace
bcaf245e64
photos#new doesn't redirect, needs item
2018-06-04 16:10:24 +12:00
Brenda Wallace
748da6c3e6
Comments from deleted members need to show
2018-06-04 16:02:07 +12:00
Brenda Wallace
517cfa3acd
spec fixes
2018-06-04 15:34:50 +12:00
Brenda Wallace
a590b89302
Photos in spec needs to have same owner as item they link to
2018-06-04 15:29:59 +12:00
Brenda Wallace
127b72b279
Updated spec to look for 404 page instead of exception
2018-06-04 12:09:31 +12:00
Brenda Wallace
a221f10113
Move photos owner validation to models
2018-06-04 12:03:11 +12:00
Brenda Wallace
b898d83d21
Fix up notification redirect spec
2018-06-04 11:49:30 +12:00
Brenda Wallace
6913233596
Use factorybot in more tests
2018-06-04 11:39:22 +12:00
Brenda Wallace
02c5571a9a
Notifications need sender and reciever in factory
2018-06-04 11:38:15 +12:00
Brenda Wallace
cc838e19b5
Show a 404 page on record not found
2018-06-04 10:59:34 +12:00
jenkr55
9e182b07aa
Dont allow any kind of newline
2018-05-28 12:46:08 -05:00
jenkr55
f67e8ceb95
Dont allow newlines
2018-05-28 12:29:44 -05:00
jenkr55
a973485c4b
Allow ascii
2018-05-28 12:04:44 -05:00
jenkr55
f1a4bd19aa
New slug regex
2018-05-27 13:06:32 -05:00
jenkr55
8c5817f511
Still works with newline characters
2018-05-20 16:03:06 -05:00
jenkr55
1b1870095f
Allow garden name macrons test description accurate
2018-05-20 15:15:58 -05:00
jenkr55
cc1aaeb5ce
Updating test to allow numbers (description previously inaccurate)
2018-05-20 15:15:18 -05:00
jenkr55
2f5fa635c8
Validate for non-blank garden name
2018-05-20 14:57:57 -05:00
jenkr55
303e259fd4
Dont allow nil or blank names
2018-05-20 14:56:11 -05:00
jenkr55
3b5c953c57
Remove regex not letting utf-8 garden names save
2018-05-20 13:34:38 -05:00
Brenda Wallace
78d9e3c970
Merge pull request #1622 from Growstuff/awesomecode-factorybot/createlist-12138
...
Auto corrected by following FactoryBot/CreateList
2018-05-13 07:30:24 +12:00
Daniel O'Connor
a772bdaa8d
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-05-10 21:35:39 +09:30
Brenda Wallace
0402fee04d
Merge pull request #1637 from Br3nda/fix/remote-currency-methods
...
Remove some old currency methods from application helper
2018-05-08 07:52:36 +12:00
Brenda Wallace
9290e6d27a
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-05-02 20:08:42 +12:00
Brenda Wallace
7a1499d854
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-05-01 13:47:44 +12:00
Brenda Wallace
152cdace75
Removed spec for currency helpers
2018-05-01 13:47:25 +12:00
Brenda Wallace
ed3ae8bbd6
Remove some old currency methods from application helper
2018-05-01 13:47:25 +12:00
Brenda Wallace
81adae77f8
Merge pull request #1639 from Growstuff/bundle-update-2018-04-29-130926
...
Bundle Update on 2018-04-29
2018-04-29 18:30:55 +12:00
deppbot
681b5bbd8c
Bundle Update on 2018-04-29
2018-04-29 13:09:27 +08:00
Brenda Wallace
4e6ffc1a63
Removed spec for currency helpers
2018-04-28 22:21:35 +12:00
Brenda Wallace
1bbf0a3c18
Simplifying show_inactive_tickbox_path method
2018-04-28 22:11:02 +12:00
Brenda Wallace
cd910e74bc
Don't need to throw exception on planting save error
2018-04-28 22:05:50 +12:00
Brenda Wallace
9cfdb93aa3
Remove some old currency methods from application helper
...
Conflicts:
app/helpers/application_helper.rb
2018-04-28 21:50:15 +12:00
Brenda Wallace
90f8b9e042
Fixed last crop spec for rails5 ugprade
2018-04-28 21:30:08 +12:00
Brenda Wallace
f8a404a88b
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile
Gemfile.lock
app/models/crop.rb
app/models/forum.rb
app/models/photo.rb
app/models/planting.rb
app/models/seed.rb
db/schema.rb
spec/models/garden_spec.rb
spec/models/planting_spec.rb
2018-04-28 21:25:06 +12:00
Brenda Wallace
832cfde28d
Merge pull request #1635 from Growstuff/bundle-update-2018-04-26-092357
...
Bundle Update on 2018-04-26
2018-04-28 21:15:22 +12:00
Brenda Wallace
aa9841dc7d
Pinned elastic search to 5.0.0. or later
2018-04-28 18:34:26 +12:00
pozorvlak
caa59df3bd
Merge pull request #1625 from Growstuff/dev
...
Release 46
2018-04-27 17:04:31 +01:00
Brenda Wallace
102eaf3d6b
Merge branch 'dev' into bundle-update-2018-04-26-092357
2018-04-26 17:39:03 +12:00
Brenda Wallace
61ebd5fe99
Merge pull request #1632 from Br3nda/feature/i18n
...
i18n for plantings#index
2018-04-26 17:38:32 +12:00
Brenda Wallace
7e0e936509
Merge branch 'dev' into bundle-update-2018-04-26-092357
2018-04-26 17:27:13 +12:00
Brenda Wallace
d3faa75d1d
Merge branch 'dev' into feature/i18n
2018-04-26 17:26:55 +12:00
Brenda Wallace
1575ee1ddd
Merge pull request #1620 from Br3nda/feature/status
...
Badges for ready to harvest, days to finished
2018-04-26 17:26:36 +12:00
deppbot
5b5eacb738
Bundle Update on 2018-04-26
2018-04-26 09:23:58 +08:00
Brenda Wallace
85eea89792
i18n for plantings#index
2018-04-23 15:40:56 +12:00
Brenda Wallace
fc46685ab9
Renamed should_be_finshed? to late?
2018-04-23 13:44:53 +12:00
Brenda Wallace
db0c60be0d
Rename zombie to super_late
2018-04-23 13:33:38 +12:00
Brenda Wallace
91e851c802
Merge remote-tracking branch 'upstream/dev' into feature/status
2018-04-23 13:00:53 +12:00
Brenda Wallace
9112d4e2bb
Merge pull request #1630 from jenkr55/ProfileGardenDisplayImprovements
...
Profile garden display improvements
2018-04-22 15:33:42 +12:00
jenkr55
eed0b257fa
Fixing test because I removed this line
2018-04-21 22:03:31 -05:00
jenkr55
25bba9c126
format fixes
2018-04-21 21:55:29 -05:00
jenkr55
028c2a28a5
unneeded class
2018-04-21 21:52:55 -05:00
jenkr55
fa28fe25b6
Fixing responsive design issues
2018-04-21 21:43:19 -05:00
jenkr55
77978a76f2
Fixing notes display bug on harvest card
2018-04-21 21:27:40 -05:00
jenkr55
7be10957ec
WIP different profile page
2018-04-21 21:05:58 -05:00
jenkr55
c94d08c816
Moving bio to be by other profile information
2018-04-21 20:09:23 -05:00
Brenda Wallace
9fdc9e76df
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-04-22 12:14:23 +12:00
Brenda Wallace
eba03d0662
Merge pull request #1627 from jenkr55/InActiveFixes
...
Fixing broken "in-active" checkbox
2018-04-22 12:11:34 +12:00
Brenda Wallace
53d7cddea1
Merge branch 'dev' into InActiveFixes
2018-04-22 08:54:27 +12:00
Brenda Wallace
89cfd49616
Merge pull request #1626 from Br3nda/bundle-update
...
Bundle upgrade
2018-04-22 08:52:08 +12:00
jenkr55
ef74cc293d
Rubocop
2018-04-21 10:51:19 -05:00
jenkr55
0b191049b2
Undo this
2018-04-21 10:46:27 -05:00
jenkr55
e767ea6b38
Fixing planting wrapping issue
2018-04-21 10:36:33 -05:00
jenkr55
6cbf7d0bba
Fixing parmas issue for owner
2018-04-21 10:29:13 -05:00
jenkr55
cb5d490b1c
Fixing params not being passed to plantings controller
2018-04-21 10:26:19 -05:00
jenkr55
585e45487a
Fixing button layout issue
2018-04-21 09:16:17 -05:00
jenkr55
6310c51879
Only show data prompt when there are plantings
2018-04-21 09:08:02 -05:00
Brenda Wallace
4c33e5ea2d
Merge remote-tracking branch 'origin/feature/status' into feature/status
2018-04-21 22:11:52 +12:00
Brenda Wallace
caa5bcec4b
Only show finish button if can edit planting
2018-04-21 21:55:33 +12:00
Brenda Wallace
55bfd50123
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-04-21 21:18:30 +12:00
Brenda Wallace
86781f3491
Bundle upgrade
2018-04-21 21:14:18 +12:00
Brenda Wallace
48bf7bb2f4
Merge branch 'dev' into feature/status
2018-04-21 17:41:10 +12:00
Brenda Wallace
6677f8641f
If not crop lifespan data, use parent data
2018-04-21 17:40:22 +12:00
Brenda Wallace
e5cf8b6091
added spec for finished_predicted_at
2018-04-21 17:25:04 +12:00
Brenda Wallace
a7acf72f56
Merge branch 'master' into dev
2018-04-21 17:05:14 +12:00
Brenda Wallace
78f021c2f2
style fix up
2018-04-21 16:26:40 +12:00
Brenda Wallace
34145f7b64
Translation of string in haml
2018-04-21 16:19:51 +12:00
Brenda Wallace
ef9bb01fc9
Wrapped a long line
2018-04-21 15:34:18 +12:00
Brenda Wallace
e103e6be35
Reducing complexity in planting predictions code
2018-04-21 15:32:04 +12:00
Brenda Wallace
4ad4dd0c7f
Style fix up
2018-04-21 15:17:51 +12:00
Brenda Wallace
4df3354020
Style fix up
2018-04-21 15:17:17 +12:00
Brenda Wallace
6077d4da34
Fixed bug in garden spec
2018-04-21 15:01:33 +12:00
Brenda Wallace
34b6b54616
Name goes on garden, not planting
2018-04-21 14:33:39 +12:00
Brenda Wallace
87d43f1eb2
Move planting delete action into the bar
2018-04-21 14:26:27 +12:00
Brenda Wallace
5cc647ee9b
test that expects a garden name, set to that name
2018-04-21 14:22:20 +12:00
Brenda Wallace
948c32d1d5
test that expects a garden name, set to that name
2018-04-21 14:19:40 +12:00
Brenda Wallace
2e4378f025
Add css class to show finished/zombie/harvesting etc
2018-04-21 14:17:50 +12:00
Brenda Wallace
548fb3d3fd
Badges feature specs
2018-04-21 14:00:00 +12:00
Brenda Wallace
9966eddd37
Giving gardens unique names to stop test collisions
2018-04-21 13:52:49 +12:00
Brenda Wallace
aae7688a0e
Classes for planting badge colours
2018-04-21 13:05:15 +12:00
Brenda Wallace
9b16abd373
Render perenial progress bar the same as others
2018-04-21 13:04:31 +12:00
Brenda Wallace
87b04f60f7
Order garden's plantings by planted_at
2018-04-21 13:03:46 +12:00
Brenda Wallace
a8509acd49
Zombie status needs 90 days
2018-04-21 13:02:51 +12:00
Brenda Wallace
ca8dae4b78
Moving the planting buttons lower
2018-04-21 13:02:09 +12:00
Brenda Wallace
1b3e00fba0
Colours for badges on plantings
2018-04-21 13:00:24 +12:00
Brenda Wallace
935aebcb0d
Tidy up visual link between planting thumbnail and crop name
2018-04-21 12:38:32 +12:00
Brenda Wallace
4fe8cd566b
USe finished not finished?
...
because some plants have finished_at in the past but haven't had their .finished set to true yet
2018-04-21 12:37:00 +12:00
Brenda Wallace
9188bd384d
Futher simplifying planting badges
2018-04-21 11:36:48 +12:00
Brenda Wallace
8ce0717c0f
Fixing up planting helper predictions
2018-04-21 11:36:02 +12:00
Brenda Wallace
4c7529eb8e
Merge remote-tracking branch 'origin/feature/status' into feature/status
2018-04-21 11:14:32 +12:00
Brenda Wallace
f8b76e9c84
Reducing complexity in planting predictions
2018-04-21 11:12:25 +12:00
Brenda Wallace
16341da7bd
Merge branch 'dev' into feature/status
2018-04-21 10:55:40 +12:00
Brenda Wallace
0d7542a43d
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-04-21 10:55:28 +12:00
Brenda Wallace
8dead992d3
Merge pull request #1624 from Br3nda/fix/awesome
...
Revert "Auto corrected by following Style/ExpandPathArguments"
2018-04-21 10:55:11 +12:00
Brenda Wallace
cdde3994b2
Revert "Auto corrected by following Style/ExpandPathArguments"
...
This reverts commit a5b84403bb .
2018-04-21 10:35:28 +12:00
Brenda Wallace
44196f7d65
Merge remote-tracking branch 'origin/feature/status' into feature/status
2018-04-21 10:24:13 +12:00
Brenda Wallace
dc62ab05ad
Merge remote-tracking branch 'upstream/dev' into feature/status
2018-04-21 10:21:40 +12:00
Brenda Wallace
15e64226c8
Merge branch 'dev' into feature/status
2018-04-21 10:21:05 +12:00
Brenda Wallace
c860f7c14b
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-04-21 10:20:38 +12:00
Brenda Wallace
944af28e3c
Merge pull request #1623 from Growstuff/awesomecode-style/expandpatharguments-12138
...
Auto corrected by following Style/ExpandPathArguments
2018-04-21 10:20:18 +12:00
Awesome Code
a5b84403bb
Auto corrected by following Style/ExpandPathArguments
2018-04-20 22:19:28 +00:00
Awesome Code
afc4441ce1
Auto corrected by following FactoryBot/CreateList
2018-04-20 22:19:04 +00:00
Brenda Wallace
b7d4781aef
Split the planting&harvest predictions into files
2018-04-21 10:18:18 +12:00
Brenda Wallace
c2ff3790db
set finished false on planting factory
...
some code+tests doesn't cope with nil
2018-04-21 09:22:35 +12:00
Brenda Wallace
a2f2e24aa1
Merge remote-tracking branch 'upstream/dev' into feature/status
2018-04-21 09:07:10 +12:00
pozorvlak
f1a40e4305
Merge pull request #1621 from jenkr55/SecondCommentButton
...
Show second comment button when many comments on a post
2018-04-20 10:51:18 +01:00
jenkr55
4120069e4c
Fixing trailing whitespace
2018-04-19 12:17:36 -05:00
jenkr55
18a7306fd0
Merge branch 'SecondCommentButton' of github.com:jenkr55/growstuff into SecondCommentButton
2018-04-19 12:11:03 -05:00
jenkr55
b3962bc9bc
Comment button same style
2018-04-19 12:10:19 -05:00
Brenda Wallace
7a112aeecf
Grammar correction in method name
2018-04-19 13:49:54 +12:00
Jennifer Kruse
296daa7a56
Merge branch 'dev' into SecondCommentButton
2018-04-18 20:47:53 -05:00
Brenda Wallace
5bf75fa36f
Only show finish prediction badges if we have enough data
2018-04-19 13:45:47 +12:00
Brenda Wallace
279c922b34
Rename update predictions methods to have !
2018-04-19 13:45:29 +12:00
Brenda Wallace
3ed90b8d04
Moving predictions to own file
2018-04-19 13:44:39 +12:00
jenkr55
634dc936f9
Show second comment button when many comments
2018-04-18 19:32:24 -05:00
Brenda Wallace
2a8c4d4829
Add finished and finished_at to plantings factory
2018-04-17 10:06:40 +12:00
Brenda Wallace
3ee2537438
Only show time to finished if not finished
2018-04-17 10:03:59 +12:00
Brenda Wallace
934bd9adb8
Fixed bug in spec, wasn't really on member's garden#index
2018-04-16 22:11:36 +12:00
Brenda Wallace
d043613bde
Model specs for harvest time and zombies
2018-04-16 21:14:47 +12:00
Brenda Wallace
d1603a6e7f
Badges showing finished and harvest status
2018-04-16 21:06:20 +12:00
Brenda Wallace
79e0bc5206
Merge pull request #1615 from Growstuff/dev
...
Release 45
2018-04-13 11:25:40 +12:00
pozorvlak
61183509b0
Merge pull request #1612 from Growstuff/Br3nda-patch-1
...
Pick the first photo
2018-04-12 15:34:22 +01:00
Brenda Wallace
6c1bbe9f1c
Merge branch 'dev' into Br3nda-patch-1
2018-04-12 14:15:49 +12:00
Brenda Wallace
bab41143fa
Merge branch 'master' into dev
2018-04-12 11:01:53 +12:00
Brenda Wallace
3c7688d2ed
Merge branch 'dev' into Br3nda-patch-1
2018-04-09 09:57:24 +12:00
Brenda Wallace
ef20d1a333
Merge pull request #1613 from jenkr55/OnlyShowPlantingSuggestionIfMatch
...
Only show planting suggestion if there's a match
2018-04-09 09:57:04 +12:00
jenkr55
9c0ddb61e7
Prevent error when @matching_plantings is nil
2018-04-08 10:17:06 -05:00
Jennifer Kruse
19acb238fd
Merge branch 'dev' into OnlyShowPlantingSuggestionIfMatch
2018-04-08 09:49:29 -05:00
jenkr55
d38167fd14
Only show planting suggestion if theres a match
2018-04-08 09:47:15 -05:00
Brenda Wallace
6b68e9ee4d
Style fix
2018-04-08 10:04:43 +12:00
Brenda Wallace
3e2b4f4183
Pick the first photo
2018-04-08 09:56:19 +12:00
Brenda Wallace
65bb523d16
Merge pull request #1609 from jenkr55/FixVariousWrappingIssues
...
Fix various wrapping issues
2018-04-08 09:03:26 +12:00
jenkr55
efa8c513ea
Adding myself as a contributor
2018-04-07 14:59:14 -05:00
jenkr55
43813d1318
Fixing various wrapping issues
2018-04-07 14:58:07 -05:00
Cesy
7e2aec9ec3
Merge pull request #1608 from Growstuff/dev
...
Release 44
2018-04-06 07:23:07 +01:00
Brenda Wallace
952224b2e1
Merge branch 'master' into dev
2018-04-03 17:46:37 +12:00
Brenda Wallace
26b1a3a6ca
Merge pull request #1605 from Br3nda/feature/ownable
...
Adding counter caches and ownable concern
2018-04-03 08:54:15 +12:00
Brenda Wallace
03c9151ecd
Merge branch 'dev' into feature/ownable
2018-04-03 08:46:34 +12:00
pozorvlak
1dd3d658eb
Merge pull request #1606 from Br3nda/fix/dependents
...
Set the behaviour of dependent models when crops are deleted from the database:
- plantings, seeds and harvests are deleted
- child crops are orphaned.
2018-04-02 15:52:10 +01:00
pozorvlak
c3b694ea7d
Merge branch 'dev' into fix/dependents
2018-04-02 15:39:16 +01:00
pozorvlak
a3e2b892d1
Merge pull request #1596 from Br3nda/fix/coverage
...
Adding codeclimate coverage
2018-04-02 15:36:48 +01:00
pozorvlak
d0f6d63d36
Merge branch 'dev' into fix/dependents
2018-04-02 15:26:07 +01:00
pozorvlak
879ce26de7
Merge branch 'dev' into fix/coverage
2018-04-02 15:21:51 +01:00
pozorvlak
98e27b5af4
Merge pull request #1602 from Br3nda/fix/ordering
...
Fix ordering of recent plantings on crops#show
2018-04-02 15:21:29 +01:00
pozorvlak
a7cfecf82c
Merge branch 'dev' into feature/ownable
2018-04-02 14:47:48 +01:00
pozorvlak
d0f28d4bef
Merge branch 'dev' into fix/ordering
2018-04-02 14:43:40 +01:00
pozorvlak
2c090757cc
Merge pull request #1601 from Br3nda/feature/fluid-layout
...
Feature/fluid layout
2018-04-02 14:40:44 +01:00
Brenda Wallace
af0c9a490b
Redirect :back deprecated. updating follows controller
2018-04-02 16:28:34 +12:00
Brenda Wallace
59cca1b8cb
Upgraded controller specs for rails 5
2018-04-02 16:18:46 +12:00
Brenda Wallace
75e401162e
More dependent declared on relationships
2018-04-02 16:12:40 +12:00
Brenda Wallace
7f8bdfe48f
Updated rubocop todo
2018-04-02 16:09:41 +12:00
Brenda Wallace
c967f7432e
Seed's parent planting is optional
2018-04-02 16:04:52 +12:00
Brenda Wallace
5dbb3a1487
Mark cms specs as pending
2018-04-02 15:59:38 +12:00
Brenda Wallace
0235690f82
More dependent declared on relationships
2018-04-02 15:58:36 +12:00
Brenda Wallace
a00237dfcb
Style fixes after rubocop upgrade
2018-04-02 15:48:16 +12:00
Brenda Wallace
11fd95e2b8
Upgrading rubocop and haml_lint to match hound
2018-04-02 15:45:06 +12:00
Brenda Wallace
91ee0150f1
Adding dependent clauses to models
2018-04-02 15:37:51 +12:00
Brenda Wallace
d19c9ab669
Remove duplicate scripts yield in layout
2018-04-02 15:31:20 +12:00
Brenda Wallace
5683f1939d
Fixed up planting model, parent is not required
2018-04-02 15:17:28 +12:00
Brenda Wallace
6149d20390
Ignore highcharts.js
2018-04-02 15:09:02 +12:00
Brenda Wallace
e43740bd3d
Two more application name renames
2018-04-02 15:05:46 +12:00
Brenda Wallace
84e47b721b
removed duplicate crop chart methods
2018-04-02 11:36:16 +12:00
Brenda Wallace
f061a1d9c7
Allow planting to have null parent_seed
2018-04-02 11:33:43 +12:00
Brenda Wallace
41ea871c80
Comment out comfy admin for now
2018-04-02 11:20:28 +12:00
Brenda Wallace
49d3f24ac8
[Corrected] Use the -> { ... } lambda literal syntax for single line lambdas.
2018-04-02 11:19:40 +12:00
Brenda Wallace
4d21e132b9
Timeline is in a different controller now
2018-04-02 11:18:56 +12:00
Brenda Wallace
7cda0aacc5
Passing class_name as string in members.requested_crops
2018-04-02 11:16:50 +12:00
Brenda Wallace
2e339ce45d
Adding rails version to new migrations
2018-04-02 11:04:31 +12:00
Brenda Wallace
700073e893
Removed duplicate gardens/timeline code
2018-04-02 11:02:22 +12:00
Brenda Wallace
fa32537c3b
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
.rubocop_todo.yml
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/members.js.erb
app/assets/stylesheets/predictions.sass
app/controllers/crops_controller.rb
app/controllers/orders_controller.rb
app/controllers/plantings_controller.rb
app/models/account.rb
app/models/account_type.rb
app/models/member.rb
app/models/order.rb
app/models/order_item.rb
app/models/product.rb
app/views/gardens/show.html.haml
app/views/layouts/application.html.haml
config/initializers/assets.rb
config/routes.rb
db/schema.rb
package-lock.json
spec/controllers/account_types_controller_spec.rb
spec/controllers/admin/orders_controller_spec.rb
spec/controllers/comments_controller_spec.rb
spec/controllers/gardens_controller_spec.rb
spec/controllers/harvests_controller_spec.rb
spec/controllers/member_controller_spec.rb
spec/controllers/order_items_controller_spec.rb
spec/controllers/orders_controller_spec.rb
spec/controllers/photo_associations_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/controllers/plantings_controller_spec.rb
spec/controllers/seeds_controller_spec.rb
spec/controllers/shop_controller_spec.rb
spec/features/crops/crop_detail_page_spec.rb
spec/models/member_spec.rb
spec/models/post_spec.rb
spec/views/crops/_planting_advice.html.haml_spec.rb
spec/views/home/_crops.html.haml_spec.rb
spec/views/orders/show.html.haml_spec.rb
spec/views/posts/show.html.haml_spec.rb
spec/views/shop/index_spec.rb
2018-04-02 10:59:13 +12:00
Brenda Wallace
106d187e67
Add dependent clauses on crop model
2018-04-02 10:29:10 +12:00
Brenda Wallace
8521047803
Merge branch 'dev' into feature/ownable
2018-04-02 10:23:07 +12:00
Brenda Wallace
e173d0c130
Merge branch 'dev' into fix/ordering
2018-04-02 10:22:20 +12:00
Brenda Wallace
53197f27eb
Merge branch 'dev' into feature/fluid-layout
2018-04-02 10:22:03 +12:00
Brenda Wallace
2460f73673
Merge branch 'dev' into fix/coverage
2018-04-02 10:21:22 +12:00
Brenda Wallace
324dcfc821
Merge pull request #1598 from Growstuff/bundle-update-2018-03-22-131347
...
Bundle Update on 2018-03-22
2018-04-02 10:21:04 +12:00
Brenda Wallace
e3bb43477b
Adding counter caches and ownable concern
2018-04-02 10:13:19 +12:00
Brenda Wallace
2d309b7645
Removing jasmine, we have no jasmine specs
2018-04-02 09:58:02 +12:00
Brenda Wallace
a59f7dd137
Merge branch 'dev' into fix/coverage
2018-04-02 09:50:11 +12:00
Brenda Wallace
1fb3c4e0f9
Regnerated and secured code climate key
2018-04-02 09:47:04 +12:00
Brenda Wallace
b64a294245
Removed duplicate margins in css
2018-04-01 18:45:35 +12:00
Brenda Wallace
31d2aa052a
More bundle updates
2018-04-01 14:16:50 +12:00
Brenda Wallace
b7f78d5dc9
Fix ordering of recent plantings on crops#show
2018-04-01 13:05:23 +12:00
Brenda Wallace
f1afe1ca79
Expanding layout to use full screen
2018-04-01 12:44:59 +12:00
Brenda Wallace
e029ef17ab
Merge remote-tracking branch 'upstream/dev' into dev
2018-04-01 09:21:37 +12:00
Brenda Wallace
d5c8b9ae27
Merge branch 'dev' into bundle-update-2018-03-22-131347
2018-03-31 18:15:25 +13:00
Brenda Wallace
f907ba9e4b
Merge pull request #1599 from Growstuff/dev
...
Release 43
2018-03-30 16:14:06 +13:00
Brenda Wallace
25070f73d7
Merge pull request #1591 from Br3nda/feature/photos-helper
...
Use photos helpers to find photos
2018-03-26 18:14:32 +13:00
Brenda Wallace
2fe6012342
Merge branch 'dev' into feature/photos-helper
2018-03-23 15:03:01 +13:00
deppbot
61468b3587
Bundle Update on 2018-03-22
2018-03-22 13:13:48 +08:00
Brenda Wallace
58c4d82087
Merge pull request #1590 from Growstuff/dev
...
Release 42
2018-03-22 15:01:52 +13:00
deppbot
c80685bf0d
Security Update on 2018-03-20 ( #1597 )
...
* Security Update on 2018-03-20
* Ordered gems, to please rubocop
2018-03-22 14:14:19 +13:00
Brenda Wallace
69018f2c5c
Merge remote-tracking branch 'upstream/dev' into dev
2018-03-22 11:53:29 +13:00
Brenda Wallace
00ea96a73e
Can't rename GROWSTUFF_ELASTICSEARCH
2018-03-20 11:35:01 +13:00
Brenda Wallace
a1e33ae36e
Only set up database and assets in test run, not linter run
2018-03-20 11:13:11 +13:00
Brenda Wallace
7f24927dc9
Clean up errors on undefined shell vars
2018-03-20 11:06:37 +13:00
Brenda Wallace
a178d3d42a
Fix ES install on travis
2018-03-19 18:02:26 +13:00
Brenda Wallace
6089198f5c
fixed path to scripts
2018-03-19 17:52:25 +13:00
Brenda Wallace
715ff4d41d
Merge branch 'dev' into fix/coverage
2018-03-19 17:47:01 +13:00
Brenda Wallace
5992c974c7
Adding codeclimate coverage
2018-03-19 17:08:04 +13:00
Brenda Wallace
511e89fa58
Merge branch 'dev' into feature/photos-helper
2018-03-19 13:39:02 +13:00
Daniel O'Connor
13d8a29773
Merge pull request #1592 from Br3nda/fix/layout
...
Layout fixes for mobile and smaller screens
2018-03-19 10:38:12 +10:30
Brenda Wallace
dc09a6ea91
Merge branch 'dev' into fix/layout
2018-03-16 14:55:03 +13:00
Brenda Wallace
f8e83cdb9c
Merge branch 'dev' into feature/photos-helper
2018-03-16 14:54:53 +13:00
deppbot
64a8cfb59f
Security Update on 2018-03-16 ( #1593 )
2018-03-16 14:54:36 +13:00
Brenda Wallace
2f81d6c78d
Layout fixes for mobile and smaller screens
2018-03-15 23:01:51 +13:00
Brenda Wallace
ece7113c89
DRY photo helper spec
2018-03-15 22:56:32 +13:00
Brenda Wallace
8941c577e4
Specs for photos helper
2018-03-14 22:25:30 +13:00
Brenda Wallace
1bf1076076
Photos helper
2018-03-14 19:28:18 +13:00
Brenda Wallace
8906fd38ae
For seeds, use planting photo if no seeds photo
2018-03-14 15:21:40 +13:00
Daniel O'Connor
d5be92ac8b
Merge pull request #1588 from Br3nda/fix/photo-order-1547
...
Fix/photo order 1547
2018-03-13 00:22:35 +10:30
Brenda Wallace
40d71ae070
Merge branch 'dev' into fix/photo-order-1547
2018-03-12 11:41:12 +13:00
Brenda Wallace
2f45041f8c
Fixed ordering of photos on crops#show
2018-03-12 08:56:39 +13:00
Brenda Wallace
f9d4e1d6ae
Ancestry of food. Seeds -> Planting -> Seeds -> Planting ( #1550 )
...
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
2018-03-12 08:39:32 +13:00
Brenda Wallace
80203ad215
Merge pull request #1585 from Growstuff/dev
...
Release 41
2018-03-11 14:03:50 +13:00
Brenda Wallace
8c51d7bdd5
Merge branch 'master' into dev
2018-02-18 13:09:56 +13:00
Cesy
64e3b3b4d4
Merge pull request #1565 from Growstuff/awesomecode-style/andor-8234
...
Auto corrected by following Style/AndOr
2018-02-16 08:47:02 +00:00
Brenda Wallace
978523fd94
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-11 08:50:50 +13:00
Brenda Wallace
97f63d1147
Merge pull request #1583 from Growstuff/dev
...
Production hotfix
2018-02-11 08:42:49 +13:00
Brenda Wallace
1a9ff5eb4c
Merge branch 'master' into dev
2018-02-11 08:14:44 +13:00
Brenda Wallace
72b1494db9
Merge pull request #1582 from Br3nda/hotfix-migration
...
Don't update flickr photos in migration
2018-02-11 08:14:00 +13:00
Brenda Wallace
83bba916a4
Don't update flickr photos in migration
2018-02-10 18:41:11 +13:00
Brenda Wallace
64179850ff
Merge pull request #1563 from Growstuff/dev
...
Release 40
2018-02-10 09:04:55 +13:00
Brenda Wallace
9cdf2e899f
Merge pull request #1569 from Br3nda/remove/paid-accounts
...
Removing shop, products, accounts, orders
2018-02-09 11:09:36 +13:00
Brenda Wallace
2eacf346a8
Merge remote-tracking branch 'origin/remove/paid-accounts' into remove/paid-accounts
2018-02-09 10:53:47 +13:00
Brenda Wallace
aab91e2fa9
Removed active merchant
2018-02-09 10:53:05 +13:00
Brenda Wallace
2217d87b5a
Added back the member's last login
2018-02-09 10:53:05 +13:00
Brenda Wallace
44b2251896
Re-instated the member-since text on profiles
2018-02-09 10:53:05 +13:00
Brenda Wallace
f5e20cd2d2
Re-gen rubocop todo
2018-02-09 10:53:05 +13:00
Brenda Wallace
42de726405
Removing shop, products, accounts, orders
2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1
Revert "Auto corrected by following Style/StringLiterals"
...
This reverts commit ab56a3c6b3 .
2018-02-09 07:58:47 +13:00
Brenda Wallace
6b6ed7e31c
Merge remote-tracking branch 'origin/remove/paid-accounts' into remove/paid-accounts
2018-02-09 07:47:53 +13:00
Brenda Wallace
564901f93f
Merge branch 'dev' into remove/paid-accounts
2018-02-09 07:46:51 +13:00
Brenda Wallace
f8127eeec3
Revert "Auto corrected by following Style/StringLiterals"
...
This reverts commit ab56a3c6b3 .
2018-02-09 07:44:48 +13:00
Brenda Wallace
33fb2408d6
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-07 14:25:41 +13:00
Awesome Code
ab56a3c6b3
Auto corrected by following Style/StringLiterals
2018-02-07 10:20:26 +13:00
Brenda Wallace
ef4b4d0c46
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-07 08:41:30 +13:00
Brenda Wallace
44ba29137d
Merge branch 'dev' into remove/paid-accounts
2018-02-07 08:41:17 +13:00
deppbot
ed2fcc2ada
Bundle Update on 2018-02-07
2018-02-07 08:40:54 +13:00
Brenda Wallace
0b5c45d08f
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-05 16:13:15 +13:00
Brenda Wallace
54c880a66c
Removed active merchant
2018-02-05 15:40:37 +13:00
Brenda Wallace
0699677d05
Added back the member's last login
2018-02-05 14:42:41 +13:00
Brenda Wallace
3c411f15b8
Re-instated the member-since text on profiles
2018-02-05 14:42:05 +13:00
Brenda Wallace
dcf5286275
Re-gen rubocop todo
2018-02-05 14:38:08 +13:00
Brenda Wallace
7e1e2bef91
Removing shop, products, accounts, orders
2018-02-05 14:32:59 +13:00
Brenda Wallace
5cda14f87a
Don't update flickr meta data on db rollback
2018-02-05 12:52:59 +13:00
Brenda Wallace
88da0da616
Re-fetches from flickr
2018-02-05 12:52:59 +13:00
Meir Taffel
a69afd87e7
Add date_taken to photos
2018-02-05 12:52:59 +13:00
Brenda Wallace
57bfafccc7
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-05 12:28:08 +13:00
deppbot
24931381af
Bundle Update on 2018-02-03
2018-02-04 08:25:59 +13:00
deppbot
742c7e30a9
Bundle Update on 2018-01-31
2018-01-31 13:12:08 +13:00
Daniel O'Connor
2f3e368ede
Merge branch 'dev' into awesomecode-style/andor-8234
2018-01-29 11:45:51 +10:30
Daniel O'Connor
502a20cf10
Merge pull request #1564 from Growstuff/awesomecode-rspec/leadingsubject-8234
...
Auto corrected by following RSpec/LeadingSubject
2018-01-29 11:45:07 +10:30
Brenda Wallace
b2cf022522
Removed extra blank lines
2018-01-29 13:01:49 +13:00
Shiny
3d4598e4e1
style clean up
2018-01-29 12:56:41 +13:00
Awesome Code
94db28b3a9
Auto corrected by following Style/AndOr
2018-01-28 23:47:38 +00:00
Awesome Code
767477df66
Auto corrected by following RSpec/LeadingSubject
2018-01-28 23:47:27 +00:00
Brenda Wallace
7f87ee1018
Fixed default_photo for seeds - uses own photos, not the crop
2018-01-29 09:55:06 +13:00
deppbot
093a948922
Bundle Update on 2018-01-28
2018-01-29 09:54:30 +13:00
deppbot
be1553410f
Bundle Update on 2018-01-24
2018-01-29 09:54:20 +13:00
Shiny
caf41e80c9
Patching paperclip gem
2018-01-24 15:07:06 +13:00
deppbot
2eff7d6716
Bundle Update on 2018-01-21
2018-01-23 09:00:34 +13:00
Shiny
df5006c61c
Disable jshint
...
this is on by default
2018-01-23 09:00:34 +13:00
Brenda Wallace
1e0565dd9b
Tell hound to ignore the bootstrap plugin file
2018-01-23 09:00:34 +13:00
Brenda Wallace
3453a648fa
Latest versions of bootstrap accessibility plugin
2018-01-23 09:00:34 +13:00
Awesome Code
e8d9314cff
Auto corrected by following Style/Lambda
2018-01-23 09:00:34 +13:00
Brenda Wallace
92e56cfc1e
Fixed up a spec, use sign_in member instead of stubing
2018-01-23 09:00:34 +13:00
Brenda Wallace
3dc356eb29
order gardens by name on plantings form
2018-01-23 09:00:34 +13:00
Brenda Wallace
56ed61b2b3
Lock pg < 1.0.0 for now
2018-01-23 09:00:34 +13:00
Brenda Wallace
16ad5384d1
Moved gardens chart to dedicated controller
2018-01-23 09:00:34 +13:00
Brenda Wallace
cf93489af7
Fixed crops chart permissions by moving to another controller
2018-01-23 09:00:34 +13:00
Brenda Wallace
86b9a3650b
Move application.js loading last again
2018-01-23 09:00:34 +13:00
Brenda Wallace
625a035f44
Scope js variables so they are not global
2018-01-23 09:00:34 +13:00
Brenda Wallace
196d37dee9
Re-instated the extra fields on crop.json
2018-01-23 09:00:34 +13:00
Shiny
6f613635d2
Update crop_detail_page_spec.rb
2018-01-23 09:00:34 +13:00
Awesome Code
46267b2a1d
Auto corrected by following Style/MutableConstant
2018-01-23 09:00:34 +13:00
Awesome Code
8c8d549cb1
Auto corrected by following RSpec/NotToNot
2018-01-23 09:00:34 +13:00
Awesome Code
d9cc1dcae8
Auto corrected by following RSpec/MultipleSubjects
2018-01-23 09:00:34 +13:00
Brenda Wallace
9db4736229
Permissions (and specs) for charts json
2018-01-23 09:00:34 +13:00
pozorvlak
04a7c41f63
Only deploy from the Elasticsearch build job
...
Fixes #1099 , or at least works around it, though a better solution would
be to rewrite our deployment system using Travis build stages or Heroku
build pipelines.
The Elasticsearch job was picked because it's the one most likely to
fail, and I can't work out how to deploy only if all three jobs pass.
2018-01-23 09:00:34 +13:00
Brenda Wallace
78b8be1fc2
Use .presence to find finished ts in timeline
2018-01-23 09:00:34 +13:00
Brenda Wallace
b6e9539127
Use predicted finish times to put current plantings on the timeline
2018-01-23 09:00:34 +13:00
Brenda Wallace
33276874a8
add google js to gardens#show
2018-01-23 09:00:34 +13:00
Brenda Wallace
9adb3d1e4e
Removed d3 graph tests
2018-01-23 09:00:34 +13:00
Awesome Code
3391f6c392
Auto corrected by following Style/RescueStandardError
2018-01-23 09:00:34 +13:00
Awesome Code
a13acbe087
Auto corrected by following Style/ParallelAssignment
2018-01-23 09:00:34 +13:00
Awesome Code
0c8240d4e8
Auto corrected by following Style/OrAssignment
2018-01-23 09:00:34 +13:00
Brenda Wallace
5ea7ae8af0
Added Harvested for chart
2018-01-23 09:00:34 +13:00
Brenda Wallace
eb1b890eec
Add planted_from chart
2018-01-23 09:00:34 +13:00
Brenda Wallace
4821bf3b07
Wrapped thre crops show js in a document.ready
2018-01-23 09:00:34 +13:00
Brenda Wallace
b83db1d4e7
Fix predictions, it wasn't showing nil
2018-01-23 09:00:34 +13:00
Awesome Code
dea7ce241b
Auto corrected by following RSpec/EmptyLineAfterFinalLet
2018-01-23 09:00:34 +13:00
Awesome Code
8d166f1fe6
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
2018-01-23 09:00:34 +13:00
Brenda Wallace
49253b59ee
Fixing up prediction specs
2018-01-23 09:00:34 +13:00
Brenda Wallace
ca16b2c407
Removed ignore of highcharts
2018-01-23 09:00:34 +13:00
Brenda Wallace
427a0187e1
updated prediction spec
2018-01-23 09:00:34 +13:00
Brenda Wallace
b1096cd021
Moved chart includes to application.js, attempting to fix json parse error
2018-01-23 09:00:34 +13:00
Awesome Code
020d024e4b
Auto corrected by following EmptyLine
2018-01-23 09:00:34 +13:00
Brenda Wallace
070a4605d0
Add a green border around predictions boxes
2018-01-23 09:00:34 +13:00
Brenda Wallace
1f8413bf3e
Remove highcharts.js, we're not using it
2018-01-23 09:00:34 +13:00
Brenda Wallace
59c3edcf82
Add timeline to gardens
2018-01-23 09:00:34 +13:00
Brenda Wallace
1bf05f81ab
Convert to use chartkick gem
...
Conflicts:
Gemfile
Gemfile.lock
config/initializers/assets.rb
2018-01-23 09:00:34 +13:00
Brenda Wallace
e6e88fa0c7
Fixed up tabulation
2018-01-23 09:00:34 +13:00
Brenda Wallace
308e834713
Wrap long line
2018-01-23 09:00:34 +13:00
Brenda Wallace
121deb4f48
Fix ordering of crops' parent on form
2018-01-23 09:00:34 +13:00
Brenda Wallace
4b65f28461
Added new line at end of file
2018-01-23 09:00:34 +13:00
Brenda Wallace
87708f1765
Tabulation and jsdoc fixes
2018-01-23 09:00:34 +13:00
Brenda Wallace
2cf335a064
Removed unused variables in js
2018-01-23 09:00:34 +13:00
Brenda Wallace
b205f35399
Wrapped a long line
2018-01-23 09:00:34 +13:00
Brenda Wallace
a4c06207e3
more JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
580fac6aa1
removed 2 unused variable in js
2018-01-23 09:00:34 +13:00
Brenda Wallace
4a696af9ba
Fix up JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
d2a060ad49
added JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
d898f926d5
added JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
49444edc61
contributors/commits update
2018-01-23 09:00:34 +13:00
Brenda Wallace
a4c7de381e
converted variable to camel case
2018-01-23 09:00:34 +13:00
Brenda Wallace
61408d7e4e
Some js cleanups
2018-01-23 09:00:34 +13:00
Brenda Wallace
9906036faf
Add bootstrap js to codeclimate excludes
2018-01-23 09:00:34 +13:00
Brenda Wallace
e009d9532a
Updating javascript style
2018-01-23 09:00:34 +13:00
Brenda Wallace
9f1c064900
Use the old "var" syntax, and max line 120
2018-01-23 09:00:34 +13:00
Brenda Wallace
8d3d8f3c91
Adding package lock, and eslint
2018-01-23 09:00:34 +13:00
deppbot
0feed2d359
Bundle Update on 2017-12-24
2018-01-23 09:00:34 +13:00
Brenda Wallace
d9bdc46099
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/members.js.erb
2018-01-21 21:20:43 +13:00
Daniel O'Connor
ed18932a5d
Merge pull request #1544 from Br3nda/fix/scope-js
...
Scope js variables so they are not global
2018-01-21 16:35:54 +10:30
Brenda Wallace
8cdefb6fcc
Scope js variables so they are not global
2018-01-21 18:39:00 +13:00
Shiny
0938e2839a
Merge pull request #1531 from Growstuff/awesomecode-rspec/multiplesubjects-7391
...
Auto corrected by following RSpec/MultipleSubjects
2018-01-21 17:33:13 +13:00
Daniel O'Connor
4e080c7fcd
Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391
2018-01-20 16:23:02 +10:30
Daniel O'Connor
0cdaa12000
Merge pull request #1535 from Growstuff/awesomecode-style/mutableconstant-7391
...
Auto corrected by following Style/MutableConstant
2018-01-20 16:22:32 +10:30
Shiny
505c084f47
Merge branch 'dev' into awesomecode-style/mutableconstant-7391
2018-01-20 17:28:49 +13:00
Daniel O'Connor
a53fa7781c
Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391
2018-01-18 14:07:34 +10:30
Daniel O'Connor
75d4740a91
Merge pull request #1532 from Growstuff/awesomecode-rspec/nottonot-7391
...
Auto corrected by following RSpec/NotToNot
2018-01-17 20:21:25 +10:30
Shiny
16c54d1c61
Merge branch 'dev' into awesomecode-style/mutableconstant-7391
2018-01-15 14:25:05 +13:00
Shiny
09045fabfc
Merge branch 'dev' into awesomecode-rspec/nottonot-7391
2018-01-15 14:24:44 +13:00
Shiny
a2bea8aaf4
Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391
2018-01-15 14:24:38 +13:00
pozorvlak
0491ec1e4c
Merge pull request #1527 from Br3nda/charts-with-specs
...
Charts specs
2018-01-14 22:54:10 +00:00
Shiny
4f0c004e50
Update crop_detail_page_spec.rb
2018-01-14 12:04:32 +13:00
Awesome Code
7fb2690306
Auto corrected by following Style/MutableConstant
2018-01-13 22:51:04 +00:00
Awesome Code
273e4c07d8
Auto corrected by following RSpec/NotToNot
2018-01-13 22:49:49 +00:00
Awesome Code
b6aef19be6
Auto corrected by following RSpec/MultipleSubjects
2018-01-13 22:49:36 +00:00
Shiny
d18b7df611
Merge branch 'dev' into charts-with-specs
2018-01-14 10:06:06 +13:00
Shiny
5f28e3e02d
Merge pull request #1526 from pozorvlak/deploy_only_once
...
Only deploy from the Elasticsearch build job
2018-01-13 23:30:50 +13:00
Shiny
6efdcb74d3
Merge branch 'dev' into charts-with-specs
2018-01-13 22:58:57 +13:00
Shiny
d32d068527
Merge branch 'dev' into deploy_only_once
2018-01-13 22:58:15 +13:00
Shiny
09771d323a
Merge pull request #1521 from Growstuff/awesomecode-style/orassignment-7269
...
Auto corrected by following Style/OrAssignment
2018-01-13 22:57:58 +13:00
Shiny
c618f7a690
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-13 22:19:45 +13:00
Brenda Wallace
3a4443a4fe
Permissions (and specs) for charts json
2018-01-13 22:15:27 +13:00
Shiny
238f87f616
Merge branch 'dev' into deploy_only_once
2018-01-13 22:11:34 +13:00
pozorvlak
2a2bef71da
Merge pull request #1518 from Growstuff/awesomecode-factorybot/dynamicattributedefinedstatically-7220
...
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
2018-01-12 11:51:54 +00:00
pozorvlak
b576b4b83e
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-12 11:38:49 +00:00
pozorvlak
e8bcce2ad3
Only deploy from the Elasticsearch build job
...
Fixes #1099 , or at least works around it, though a better solution would
be to rewrite our deployment system using Travis build stages or Heroku
build pipelines.
The Elasticsearch job was picked because it's the one most likely to
fail, and I can't work out how to deploy only if all three jobs pass.
2018-01-12 11:31:28 +00:00
pozorvlak
723c4d4345
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-12 11:22:08 +00:00
pozorvlak
a8eee7624a
Merge pull request #1522 from Growstuff/awesomecode-style/parallelassignment-7269
...
Auto corrected by following Style/ParallelAssignment
2018-01-12 11:21:46 +00:00
pozorvlak
c7a3911694
Merge branch 'dev' into awesomecode-style/parallelassignment-7269
2018-01-12 09:57:26 +00:00
Shiny
6ccfa7f008
Merge pull request #1515 from Br3nda/timeline
...
Garden Timeline
2018-01-12 10:59:15 +13:00
Brenda Wallace
b831c29c97
Use .presence to find finished ts in timeline
2018-01-12 09:27:09 +13:00
Brenda Wallace
cc1d3b4f43
Use predicted finish times to put current plantings on the timeline
2018-01-12 08:07:38 +13:00
Brenda Wallace
150a0dd99e
Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5
...
Conflicts:
spec/controllers/photo_associations_controller_spec.rb
2018-01-12 07:57:02 +13:00
Brenda Wallace
29be61c790
Merge branch 'timeline' into upgrade/rails-5
2018-01-12 07:56:09 +13:00
Brenda Wallace
c442bdbd45
add google js to gardens#show
2018-01-12 07:53:34 +13:00
Shiny
bf2b32ffaa
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-11 16:13:34 +13:00
Shiny
cba0a40246
Merge branch 'dev' into awesomecode-style/parallelassignment-7269
2018-01-11 16:13:24 +13:00
Shiny
dd536d607b
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-11 16:13:10 +13:00
Brenda Wallace
f4e87a974d
Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5
...
Conflicts:
app/views/gardens/show.html.haml
spec/controllers/photo_associations_controller_spec.rb
2018-01-11 16:10:36 +13:00
Brenda Wallace
2d813e49de
add google js to gardens#show
2018-01-11 15:36:27 +13:00
Shiny
43c2ac7244
Merge branch 'dev' into upgrade/rails-5
2018-01-11 15:00:28 +13:00
Shiny
31d3f17d78
Merge branch 'dev' into upgrade/rails-5
2018-01-11 14:59:57 +13:00
Shiny
d1e3322075
Merge branch 'dev' into timeline
2018-01-11 14:58:48 +13:00
Shiny
091ed0e1be
Merge pull request #1514 from Br3nda/charts
...
Use ChartKick gem for charts
2018-01-11 14:58:04 +13:00
Shiny
fb00f6a23a
Merge branch 'dev' into timeline
2018-01-11 13:12:29 +13:00
Shiny
01d6232bcf
Merge branch 'dev' into charts
2018-01-11 13:11:32 +13:00
Daniel O'Connor
3e5de8bce4
Merge branch 'dev' into upgrade/rails-5
2018-01-11 10:04:56 +10:30
Daniel O'Connor
609b468675
Merge branch 'dev' into upgrade/rails-5
2018-01-11 10:04:21 +10:30
Daniel O'Connor
b172c5f242
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-11 10:01:38 +10:30
Daniel O'Connor
8afff39c09
Merge pull request #1523 from Growstuff/awesomecode-style/rescuestandarderror-7269
...
Auto corrected by following Style/RescueStandardError
2018-01-11 10:00:50 +10:30
Brenda Wallace
f2b88a94ef
Merge branch 'charts' into upgrade/rails-5
2018-01-11 09:32:31 +13:00
Brenda Wallace
26a5ba70ef
Merge branch 'charts' into timeline
2018-01-11 09:32:14 +13:00
Brenda Wallace
7dab57f9ba
Removed d3 graph tests
2018-01-11 09:31:59 +13:00
Brenda Wallace
0d35b4ca6d
Updating rubocop todo
2018-01-11 09:26:48 +13:00
Awesome Code
1a4e0bd48a
Auto corrected by following Style/RescueStandardError
2018-01-10 20:18:17 +00:00
Awesome Code
e865e93665
Auto corrected by following Style/ParallelAssignment
2018-01-10 20:18:10 +00:00
Awesome Code
bd32647178
Auto corrected by following Style/OrAssignment
2018-01-10 20:17:58 +00:00
Shiny
a931f26b00
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-11 09:15:00 +13:00
Brenda Wallace
350787d4e4
Merge branch 'charts' into upgrade/rails-5
2018-01-11 09:12:20 +13:00
Brenda Wallace
7b59480928
Merge branch 'charts' into timeline
2018-01-11 09:12:06 +13:00
Brenda Wallace
390282f9f2
Added Harvested for chart
2018-01-11 09:03:13 +13:00
Brenda Wallace
8e0b7d9ded
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/crops.js.erb
spec/controllers/comments_controller_spec.rb
spec/controllers/harvests_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/controllers/plantings_controller_spec.rb
spec/models/post_spec.rb
spec/views/home/_crops.html.haml_spec.rb
2018-01-11 08:34:20 +13:00
Brenda Wallace
56a76004df
Merge branch 'charts' into timeline
2018-01-11 08:31:09 +13:00
Brenda Wallace
4af36f68b4
Merge remote-tracking branch 'origin/charts' into charts
2018-01-11 08:30:38 +13:00
Brenda Wallace
ad6601b356
Add planted_from chart
2018-01-11 08:29:20 +13:00
Brenda Wallace
15594c0209
Wrapped thre crops show js in a document.ready
2018-01-11 08:26:59 +13:00
Shiny
34715b5a2a
Merge branch 'dev' into charts
2018-01-10 16:37:32 +13:00
Shiny
6641ae8257
Merge pull request #1519 from Growstuff/awesomecode-rspec/emptylineafterfinallet-7220
...
Auto corrected by following RSpec/EmptyLineAfterFinalLet
2018-01-10 16:37:07 +13:00
Shiny
ca860db074
Merge branch 'dev' into awesomecode-rspec/emptylineafterfinallet-7220
2018-01-09 21:52:49 +13:00
Shiny
5230dec20e
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-09 19:00:04 +13:00
Shiny
3029bdcb0d
Merge pull request #1517 from Growstuff/awesomecode-emptyline-7220
...
Auto corrected by following EmptyLine
2018-01-09 18:53:28 +13:00
Brenda Wallace
6d56f3f655
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/views/layouts/application.html.haml
2018-01-09 15:55:28 +13:00
Brenda Wallace
dc86404b6f
Fix predictions, it wasn't showing nil
2018-01-09 15:53:40 +13:00
Awesome Code
e46f530dc3
Auto corrected by following RSpec/EmptyLineAfterFinalLet
2018-01-09 02:00:40 +00:00
Awesome Code
3ece584390
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
2018-01-09 01:59:43 +00:00
Brenda Wallace
a2e4863f00
Fixing up prediction specs
2018-01-09 14:37:21 +13:00
Brenda Wallace
2d58099f2d
Merge remote-tracking branch 'origin/charts' into charts
2018-01-09 14:33:50 +13:00
Brenda Wallace
c5c6f7ad47
Removed ignore of highcharts
2018-01-09 14:31:03 +13:00
Brenda Wallace
2c3fe3c204
updated prediction spec
2018-01-09 13:18:58 +13:00
Brenda Wallace
1fbbc50940
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-01-09 13:11:33 +13:00
Shiny
b0afbe571f
Merge branch 'dev' into charts
2018-01-09 13:09:52 +13:00
Brenda Wallace
74ff648f90
Moved chart includes to application.js, attempting to fix json parse error
2018-01-09 12:51:21 +13:00
Awesome Code
a5fa033f2d
Auto corrected by following EmptyLine
2018-01-08 23:46:57 +00:00
Awesome Code
29a9643f00
trigger awesomecode.io notification
2018-01-08 23:46:00 +00:00
Brenda Wallace
9172d21f1d
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/assets/stylesheets/predictions.sass
2018-01-08 18:14:24 +13:00
Brenda Wallace
f3ec7e0c4e
Add a green border around predictions boxes
2018-01-08 18:12:57 +13:00
Brenda Wallace
59122d6938
Merge branch 'charts' into timeline
2018-01-08 18:03:40 +13:00
Brenda Wallace
d8cce280e2
Remove highcharts.js, we're not using it
2018-01-08 18:03:20 +13:00
Brenda Wallace
c569961029
Add timeline to gardens
2018-01-08 11:30:06 +13:00
Brenda Wallace
34280123e5
Convert to use chartkick gem
...
Conflicts:
Gemfile
Gemfile.lock
config/initializers/assets.rb
2018-01-08 11:28:59 +13:00
Brenda Wallace
865fe106ad
Unique member name on notifications spec
2018-01-07 22:10:27 +13:00
Brenda Wallace
386dc5ad7f
Use factory bot in specs
2018-01-07 19:37:03 +13:00
Brenda Wallace
8e59e68dd7
Add valid DNS entry to feature spec, so it doesn't fail
2018-01-07 19:30:52 +13:00
Brenda Wallace
52e3f03bb5
Add timeline to gardens
2018-01-07 19:25:05 +13:00
Brenda Wallace
73ffbb0272
crop creator is optional
...
doesn't get set when crop has just been requested
2018-01-07 18:44:03 +13:00
Brenda Wallace
9e5aba75d8
Added full path to jpeg in spec, so does'nt throw asset pipeline errors
2018-01-07 18:35:28 +13:00
Brenda Wallace
ac16347f0d
Small change to plantings model, so feature spec passes again
2018-01-07 18:23:42 +13:00
Brenda Wallace
bf34feacba
Convert to use chartkick gem
2018-01-07 17:25:16 +13:00
Brenda Wallace
482d15e36d
Fixed spec to specify login name before checking
2018-01-06 16:48:28 +13:00
Brenda Wallace
ca40d07148
Fixed up crops view spec
2018-01-06 16:42:18 +13:00
Brenda Wallace
f02d328d1c
commented out a cms link
2018-01-06 15:34:51 +13:00
Brenda Wallace
a9043b8f5a
specify login name and post body in spec
...
don't rely on factory to produce predictable results, specify what we're
gonna be looking for in spec
2018-01-06 15:10:25 +13:00
Brenda Wallace
4800f405ea
Two more fixes to tests for slug generation
2018-01-06 12:35:05 +13:00
Brenda Wallace
987400526e
Use distinct for plant parts
2018-01-06 12:32:04 +13:00
Brenda Wallace
c95630e249
Fixed api request specs after rails 5 upgrade
2018-01-06 12:19:42 +13:00
Brenda Wallace
dd980d3f41
Harvests#edit needs to respond with something
2018-01-06 12:06:26 +13:00
Brenda Wallace
22fd422a6d
Look for eq false in member spec
2018-01-06 11:49:35 +13:00
Brenda Wallace
d642e7cf40
set login name on member so we know what to look for in slug spec
2018-01-06 11:48:45 +13:00
Brenda Wallace
5eae80bc6d
Specify login name in spec, so we know what to look for
...
Becuase we're using the faker gem now
2018-01-06 11:38:47 +13:00
Brenda Wallace
e5beb066a0
Moved members.create_account_and_garden to private
2018-01-06 11:32:49 +13:00
Brenda Wallace
7bb49f337f
Fixing up member's account model creation, post rails 5 upgrade
2018-01-06 11:31:04 +13:00
Brenda Wallace
fcbb57e659
Respond with data on gardens#edit, so non-html formats don't break specs
2018-01-06 10:47:04 +13:00
Brenda Wallace
a0fe19651e
Plant parts model using distinct query
2018-01-06 09:31:39 +13:00
Brenda Wallace
19382a8a36
Random login name generator was running out of names
...
So here's a name plus a random number instead
It might collide sometimes alas
2018-01-06 09:23:34 +13:00
Brenda Wallace
62fd16e6b2
Notifications don't have a post if they are a message
2018-01-06 09:01:18 +13:00
Brenda Wallace
a2190dc984
Fixed a matcher in posts controller spec
2018-01-06 08:54:44 +13:00
Brenda Wallace
462654f26e
Fixed gardens controller specs
2018-01-06 08:51:11 +13:00
Brenda Wallace
641d227a87
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/application.js
package-lock.json
2018-01-06 08:46:52 +13:00
Brenda Wallace
a0cc9c0a00
fixed photo controller specs
2018-01-06 08:41:34 +13:00
pozorvlak
ace0d7ab77
Merge pull request #1505 from Br3nda/js/cleanup
...
Js clean up
2018-01-05 11:35:17 +00:00
Brenda Wallace
4e5aa8077c
Re-wrote harvests#update controller spec
2018-01-05 21:34:11 +13:00
Brenda Wallace
2b69db77bf
Use faker gem for Member factorybot
2018-01-05 21:33:21 +13:00
Brenda Wallace
2f9610a60f
Http positional arguments in rails 5
2018-01-04 21:28:48 +13:00
Brenda Wallace
46cfe527bc
add in gem 'rails-controller-testing'
2018-01-04 16:38:09 +13:00
Brenda Wallace
fefc218b4c
Merge branch 'js/cleanup' of github.com:Br3nda/growstuff into js/cleanup
2018-01-04 15:12:30 +13:00
Brenda Wallace
53c9f89bc1
Fixed up tabulation
2018-01-04 15:11:36 +13:00
Brenda Wallace
79f6f7097a
updated npm package.json
2018-01-04 15:01:09 +13:00
Brenda Wallace
090bc02269
belongs_to defaults to required. setting some to optional
2018-01-04 14:55:36 +13:00
Brenda Wallace
2fd13e9b7c
Updated new path to jquery autocomplete
2018-01-04 14:44:52 +13:00
Brenda Wallace
2109ee1561
Migrations need to specify a version
2018-01-04 14:42:25 +13:00
Brenda Wallace
79cf7b452c
removing some cms stuff
2018-01-04 14:31:24 +13:00
Brenda Wallace
9d2732fffa
removing comfortable mexican sofa for now
2018-01-04 14:29:09 +13:00
Brenda Wallace
e3a3c22e69
Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5
2018-01-04 14:05:41 +13:00
Shiny
ba2e4b5dce
Merge branch 'dev' into upgrade/rails-5
2018-01-04 14:03:19 +13:00
pozorvlak
965fb28ab3
Merge branch 'dev' into js/cleanup
2018-01-03 11:07:35 +00:00
pozorvlak
196707e6e8
Merge pull request #1508 from Br3nda/fix/1502
...
Fix/1502 Missing ordering, crops form
2018-01-03 11:07:11 +00:00
Brenda Wallace
7bc91e415a
Re-instate active_median gem
2018-01-03 19:09:32 +13:00
Brenda Wallace
d456d045cd
Changed order of photo association relationship declarations
2018-01-03 17:24:51 +13:00
Brenda Wallace
4917ab9ae8
Fixed order->member relationship, after change to paranoia gem
2018-01-03 17:21:40 +13:00
Brenda Wallace
46d56fde31
Application job for Rails 5
2018-01-03 17:20:08 +13:00
Brenda Wallace
65d5b2d61a
Application mailer for rails 5
2018-01-03 17:18:41 +13:00
Brenda Wallace
b6c9b13d4d
Models inherit from application record
2018-01-03 17:16:14 +13:00
Brenda Wallace
f4af682d45
Updated code for Rail 5
2018-01-03 17:12:17 +13:00
Brenda Wallace
f1c8743623
Config for rails 5
2018-01-03 17:10:50 +13:00
Brenda Wallace
26f525e88a
Upgrade gems for rails 5
...
Note: Unlocks elastic search gem, and removes debuggers
2018-01-03 17:06:54 +13:00
Brenda Wallace
00130b3c0a
Merge remote-tracking branch 'origin/fix/1502' into fix/1502
2018-01-03 15:12:31 +13:00
Brenda Wallace
d86de897c7
Wrap long line
2018-01-03 15:12:09 +13:00
Brenda Wallace
466a9d6d8a
Merge remote-tracking branch 'upstream/dev' into dev
2018-01-03 15:10:08 +13:00
Shiny
0db3b3d532
Merge branch 'dev' into fix/1502
2018-01-03 15:10:00 +13:00
Brenda Wallace
a39c304fac
Fix ordering of crops' parent on form
2018-01-03 15:06:55 +13:00
Brenda Wallace
ee1617c7c3
Added new line at end of file
2018-01-03 14:43:29 +13:00
Brenda Wallace
0a71bfe99f
Tabulation and jsdoc fixes
2018-01-03 14:40:22 +13:00
Brenda Wallace
56b0562785
Removed unused variables in js
2018-01-03 14:24:08 +13:00
Brenda Wallace
2d98a7e793
Wrapped a long line
2018-01-03 14:21:29 +13:00
Brenda Wallace
978317f47a
more JSDoc
2018-01-03 14:20:01 +13:00
Brenda Wallace
4570fda384
removed 2 unused variable in js
2018-01-03 13:03:10 +13:00
Brenda Wallace
122a7f17e2
Fix up JSDoc
2018-01-03 13:01:48 +13:00
Brenda Wallace
591c95dca2
added JSDoc
2018-01-03 12:56:52 +13:00
Brenda Wallace
e910bfd50f
added JSDoc
2018-01-03 12:54:33 +13:00
Brenda Wallace
7c25161574
contributors/commits update
2018-01-03 12:48:13 +13:00
Brenda Wallace
0db2d6b346
converted variable to camel case
2018-01-03 12:42:20 +13:00
Brenda Wallace
5584da02c3
Some js cleanups
2018-01-03 12:35:30 +13:00
Brenda Wallace
7464668021
Add bootstrap js to codeclimate excludes
2018-01-03 12:02:21 +13:00
Brenda Wallace
29dcc01cde
Merge remote-tracking branch 'upstream/dev' into js/cleanup
2018-01-03 11:54:09 +13:00
Brenda Wallace
a836d6432f
Updating javascript style
2018-01-03 11:52:47 +13:00
Brenda Wallace
4e0f7e9086
Use the old "var" syntax, and max line 120
2018-01-03 11:49:06 +13:00
Brenda Wallace
93eba14af9
Adding package lock, and eslint
2018-01-03 11:28:12 +13:00
Shiny
7d51ba98ec
Merge pull request #1500 from Growstuff/bundle-update-2017-12-24-080947
...
Bundle Update on 2017-12-24
2017-12-24 16:43:34 +13:00
deppbot
4ba210cf81
Bundle Update on 2017-12-24
2017-12-24 08:09:48 +08:00
Cesy
c08beb5291
Merge pull request #1495 from Growstuff/dev
...
Release 37
2017-12-22 09:54:32 +00:00
pozorvlak
269f3164b7
Merge pull request #1497 from Br3nda/feature/admin-nicer
...
Nicer admin interface
2017-12-18 11:33:02 +00:00
Shiny
9d47b2b029
Merge branch 'dev' into feature/admin-nicer
2017-12-18 15:10:36 +13:00
Daniel O'Connor
81e26aaf02
Merge pull request #1496 from Br3nda/feature/ordering
...
Feature/ordering
2017-12-18 09:30:51 +10:30
Shiny
d62322b498
Merge branch 'dev' into feature/admin-nicer
2017-12-18 06:59:33 +13:00
Shiny
ebb2f90294
Merge branch 'dev' into feature/ordering
2017-12-18 06:59:17 +13:00
Shiny
72922a160d
Merge pull request #1498 from Growstuff/bundle-update-2017-12-18-000857
...
Bundle Update on 2017-12-18
2017-12-18 06:58:50 +13:00
deppbot
0699716c19
Bundle Update on 2017-12-18
2017-12-18 00:08:58 +08:00
Brenda Wallace
4c35987cb7
Ignore long method in ability.rb
2017-12-17 17:57:19 +13:00
Brenda Wallace
54e0806f38
don't check role is there's no member
2017-12-17 17:55:14 +13:00
Brenda Wallace
99828c7c01
Updated spec for new admin#index
2017-12-17 17:54:13 +13:00
Brenda Wallace
25d2773464
Use nested module/class definitions instead of compact style.
2017-12-17 17:50:30 +13:00
Brenda Wallace
233a30a045
Haml code style fix up
2017-12-17 17:49:05 +13:00
Brenda Wallace
01a7463ae8
Split up ability.rb into methods
2017-12-17 12:47:41 +13:00
Brenda Wallace
8a446ecbfc
Member admin
2017-12-17 12:45:19 +13:00
Brenda Wallace
efc60e6313
Nicer layout on editing roles
2017-12-17 12:11:55 +13:00
Brenda Wallace
406b2dbf04
Make admin index a bit nicer
2017-12-17 12:06:03 +13:00
Brenda Wallace
ac056b4eb5
Merge remote-tracking branch 'upstream/dev' into dev
2017-12-17 12:05:42 +13:00
Brenda Wallace
2394f4d237
One view for showing photos on an item
2017-12-17 11:40:55 +13:00
Brenda Wallace
2a4fd57050
Merge remote-tracking branch 'upstream/dev' into feature/ordering
2017-12-17 10:18:25 +13:00
Shiny
5c885d675e
Merge branch 'master' into dev
2017-12-17 10:05:25 +13:00
Shiny
0b08691160
Merge pull request #1474 from Br3nda/feature/photos-1457
...
Polymorphic relationship to photos
2017-12-17 10:04:30 +13:00
Brenda Wallace
b1052a2dbf
Order posts by most recent
2017-12-17 10:01:51 +13:00
Brenda Wallace
95a923ff5f
Order the plantings on the front page
2017-12-17 10:01:51 +13:00
deppbot
c8e34b640e
Bundle Update on 2017-12-14
2017-12-17 10:01:51 +13:00
Brenda Wallace
6f2b4b13cd
Only show photo pagination if there are photos
2017-12-17 09:55:52 +13:00
Brenda Wallace
970da53873
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
2017-12-17 09:15:24 +13:00
Brenda Wallace
3aa2f0bd3b
Paginate photos on seeds#show (inc feature specs)
2017-12-17 08:55:08 +13:00
Shiny
8c1514bc04
Merge branch 'dev' into feature/photos-1457
2017-12-15 17:13:12 +13:00
Daniel O'Connor
d2e39f58d5
Merge pull request #1494 from Br3nda/fix/ordering
...
More ordering fixes
2017-12-15 12:57:08 +10:30
Brenda Wallace
3d3a3b669e
Order posts by most recent
2017-12-15 13:28:41 +13:00
Brenda Wallace
8697e56323
Order the plantings on the front page
2017-12-15 13:26:48 +13:00
Shiny
472b2eb192
Merge branch 'dev' into feature/photos-1457
2017-12-15 12:10:36 +13:00
Cesy
1698157d8d
Merge pull request #1492 from Growstuff/bundle-update-2017-12-14-201051
...
Bundle Update on 2017-12-14
2017-12-14 12:25:49 +00:00
deppbot
ff652ae234
Bundle Update on 2017-12-14
2017-12-14 20:10:52 +08:00
Shiny
b4fcf004cd
Merge pull request #1484 from Growstuff/dev
...
Release 36
2017-12-14 19:37:02 +13:00
Brenda Wallace
25e9ef892d
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
2017-12-14 08:45:40 +13:00
Shiny
82149d4565
Merge branch 'dev' into feature/photos-1457
2017-12-14 08:44:31 +13:00
Brenda Wallace
fcd3e36e36
Removed commented out code
2017-12-14 08:42:51 +13:00
pozorvlak
b783448ec3
Merge pull request #1485 from Br3nda/planting-harvests
...
Show photos of a planting's harvests
2017-12-13 12:08:23 +00:00
pozorvlak
e8b5850bfe
Merge branch 'dev' into planting-harvests
2017-12-13 10:57:40 +00:00
pozorvlak
bca72680c4
Merge pull request #1490 from Br3nda/dependabot/npm_and_yarn/coffeelint-2.0.7
...
Bump coffeelint from 1.16.0 to 2.0.7
2017-12-13 10:57:18 +00:00
pozorvlak
358eb96684
Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7
2017-12-13 10:29:18 +00:00
pozorvlak
05807d41f4
Merge pull request #1491 from Br3nda/flickr-auth-fix
...
Fix Growstuff::OauthSignupAction not found error when connecting flickr
2017-12-13 10:27:16 +00:00
Shiny
96f1995768
Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7
2017-12-13 23:26:07 +13:00
Shiny
deefbbce71
Merge branch 'dev' into planting-harvests
2017-12-13 23:25:56 +13:00
Brenda Wallace
f8e51f4b45
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
2017-12-13 22:35:29 +13:00
Brenda Wallace
1c8b75b7cb
add and show photos for seeds
...
close #1457
2017-12-13 22:34:16 +13:00
Brenda Wallace
1f66df0743
Fixed link to associated flickr, twitter, facebook accountss
...
fixes #1479
2017-12-13 22:23:22 +13:00
Brenda Wallace
72f52230a1
Fix Growstuff::OauthSignupAction not found error when connecting flickr account
2017-12-13 22:19:41 +13:00
Shiny
700fba58e8
Merge branch 'dev' into feature/photos-1457
2017-12-13 21:52:55 +13:00
Daniel O'Connor
acecbe93c1
Merge pull request #1487 from Growstuff/bundle-update-2017-12-11-160933
...
Bundle Update on 2017-12-11
2017-12-13 16:20:36 +10:00
dependabot[bot]
bafe2b7fd1
Bump coffeelint from 1.16.0 to 2.0.7
...
Bumps [coffeelint](https://github.com/clutchski/coffeelint ) from 1.16.0 to 2.0.7.
- [Commits](https://github.com/clutchski/coffeelint/commits )
2017-12-12 11:00:57 +00:00
Shiny
3be1454a69
Merge branch 'dev' into bundle-update-2017-12-11-160933
2017-12-12 12:36:54 +13:00
Shiny
232e5d50ac
Merge branch 'dev' into planting-harvests
2017-12-12 12:36:33 +13:00
pozorvlak
7207a39039
Merge pull request #1486 from Br3nda/cleanup/routes
...
Convert hashes in routes
2017-12-11 10:47:18 +00:00
deppbot
291f865f7f
Bundle Update on 2017-12-11
2017-12-11 16:09:34 +08:00
Brenda Wallace
47e82eb0a7
Convert hashes in routes
2017-12-10 19:50:08 +13:00
Brenda Wallace
08dc2a0513
Show photos of a planting's harvests
2017-12-09 22:24:51 +13:00
Brenda Wallace
4f64698403
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
2017-12-09 20:59:56 +13:00
Brenda Wallace
14551b6ec8
Merge remote-tracking branch 'upstream/dev' into feature/photos-1457
...
Conflicts:
spec/models/crop_spec.rb
2017-12-09 20:59:20 +13:00
Shiny
5d44196947
Merge branch 'master' into dev
2017-12-09 13:28:10 +13:00
Shiny
1c41cb7b66
Merge pull request #1483 from Growstuff/bundle-update-2017-12-08-121126
...
Bundle Update on 2017-12-08
2017-12-09 08:25:36 +13:00
Shiny
c3c55eaa09
Merge branch 'dev' into bundle-update-2017-12-08-121126
2017-12-09 08:15:28 +13:00
pozorvlak
98aa9521fe
Merge pull request #1482 from Br3nda/ordering
...
Fixes to ordering
2017-12-08 12:04:48 +00:00
Shiny
96bb345ca9
Merge branch 'dev' into ordering
2017-12-08 20:20:27 +13:00
Shiny
9de991a075
Merge branch 'dev' into bundle-update-2017-12-08-121126
2017-12-08 20:19:39 +13:00
Shiny
f76619864c
Merge pull request #1477 from Br3nda/upgrade-rubocop
...
Rubocop upgrade (and some style fixes)
2017-12-08 20:19:08 +13:00
deppbot
ec149997b0
Bundle Update on 2017-12-08
2017-12-08 12:11:27 +08:00
Brenda Wallace
ac07f18b2d
Show most recent seeds first
2017-12-07 15:00:16 +13:00
Brenda Wallace
4ce3e8968f
crops#show order posts by most recent first
2017-12-07 14:58:57 +13:00
Brenda Wallace
cd35538b83
Order forums by name
2017-12-07 13:42:48 +13:00
Shiny
0f317f624e
Merge branch 'dev' into feature/photos-1457
2017-12-07 13:40:19 +13:00
Brenda Wallace
35d8461811
Order recent plantings by when they were planted
2017-12-07 13:39:32 +13:00
Brenda Wallace
8d03a3ffa8
Most recent photos is a crop's default photo
2017-12-06 21:47:01 +13:00
Brenda Wallace
2b0f199329
change string replacement for performance reasons
2017-12-06 15:19:34 +13:00
Brenda Wallace
24f18f78da
use bare percent literals
2017-12-06 14:33:51 +13:00
Brenda Wallace
3cc637017d
Avoid {} for multiline
2017-12-06 14:29:21 +13:00
Brenda Wallace
37f9dcd7dd
for simple loops, use Integer.times
2017-12-06 14:26:58 +13:00
Brenda Wallace
f516ef2e57
Don't use :: for method calls
2017-12-06 14:24:17 +13:00
Brenda Wallace
182c626226
Prefer if/unless modifier
2017-12-06 14:23:12 +13:00
Brenda Wallace
ea2fcd09dc
Fixed last old style word array
2017-12-06 14:18:51 +13:00
Brenda Wallace
878fc7ebcd
Use symbol procs
2017-12-06 14:17:34 +13:00
Brenda Wallace
3fdc23098e
Use perl names for cli script variables
2017-12-06 14:16:47 +13:00
Brenda Wallace
515325c44e
Fixed up % delimiters
2017-12-06 14:14:31 +13:00
Brenda Wallace
25b1836146
Removed nil comparison
2017-12-06 14:13:01 +13:00
Brenda Wallace
c925c95398
Use next, instead of a if wrapper
2017-12-06 14:11:27 +13:00
Brenda Wallace
2d00206abf
Converted sprintf to format
2017-12-06 14:10:26 +13:00
Brenda Wallace
f499f245de
Added new line after block end, for rubocpo
2017-12-06 14:08:05 +13:00
Brenda Wallace
35414391c3
modified spec to please rubocop
2017-12-06 14:07:18 +13:00
Brenda Wallace
1f7f4f52d1
Updated ability_spec.rb to use block end new lines
2017-12-06 14:02:48 +13:00
Brenda Wallace
b4efeee904
Merge remote-tracking branch 'origin/upgrade-rubocop' into upgrade-rubocop
2017-12-06 11:23:03 +13:00
Brenda Wallace
5b588bf9e9
Rubocop change namespace of some cops
2017-12-06 11:21:25 +13:00
Daniel O'Connor
07611e9a5d
Merge branch 'dev' into upgrade-rubocop
2017-12-05 11:38:52 +10:30
Daniel O'Connor
baa89a790f
Merge pull request #1480 from Growstuff/bundle-update-2017-12-05-081300
...
Bundle Update on 2017-12-05
2017-12-05 11:38:18 +10:30
deppbot
00395ae68b
Bundle Update on 2017-12-05
2017-12-05 08:13:00 +08:00
Shiny
41e26a2c74
Merge branch 'dev' into feature/photos-1457
2017-12-03 21:09:04 +13:00
Shiny
d7eb5e0014
Merge pull request #1472 from Growstuff/dev
...
Release 35
2017-12-02 21:16:29 +13:00
deppbot
f08d02f4c5
Bundle Update on 2017-12-02
2017-12-02 20:32:08 +13:00
Brenda Wallace
a6a7f789a3
Rubocop upgrade (and some style fixes)
2017-12-01 21:07:39 +13:00
Brenda Wallace
c4c659f159
DRY specs, and use create_list in crops model spec
2017-11-30 13:37:47 +13:00
Brenda Wallace
14b16b0d8c
Moved photo.items's item lookup to a class method
2017-11-30 11:23:34 +13:00
Brenda Wallace
697779e67c
Don't add item to photo is already there
2017-11-30 10:15:05 +13:00
Brenda Wallace
35ce8b84db
Adding a unique index on the items <--> photos table
2017-11-30 09:56:47 +13:00
Brenda Wallace
ccbdfe51f6
Modified a spec to avoid a chicken and an egg
2017-11-29 22:30:11 +13:00
Brenda Wallace
ff57176d60
Simplified the photos controller a bit
2017-11-29 22:13:03 +13:00
Brenda Wallace
12700d6268
Added polymorphic relationship to photos
2017-11-29 21:41:22 +13:00
Brenda Wallace
6ed7376c58
Name garden in spec to ensure it's ordered first
2017-11-29 20:59:37 +13:00
Brenda Wallace
c8a200bf19
Changed selector in view spec
...
it was having trouble finding the link
2017-11-29 20:59:37 +13:00
Brenda Wallace
a62b668781
Fix up duplicate order item in controller spec, and DRY
2017-11-29 20:59:37 +13:00
Brenda Wallace
09f82d5995
Tidy up home/crops partial view
2017-11-29 20:59:37 +13:00
Brenda Wallace
8d0bec34a6
Crops controller spec, use let, other cleanup
2017-11-29 20:59:37 +13:00
Brenda Wallace
d7ec4eacee
Fix sort on plant parts
2017-11-29 20:59:37 +13:00
Brenda Wallace
3a3f4eefbf
Added sort to members controller
2017-11-29 20:59:37 +13:00
Brenda Wallace
9e00023332
Fixed post ordering
2017-11-29 20:59:37 +13:00
Brenda Wallace
3058160a59
Removed an orderng spec for gardens
2017-11-29 20:59:37 +13:00
Brenda Wallace
e3886ce5b5
Fixed up unescaped model attribute
2017-11-29 20:59:37 +13:00
Brenda Wallace
48f8085e2d
Fix seeds order
2017-11-29 20:59:37 +13:00
Brenda Wallace
594e466fd4
Fixed photos ordering
2017-11-29 20:59:37 +13:00
Brenda Wallace
b813669d71
Updated shop controller specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
d0b8ae3411
Delete follows records when a member is deleted
2017-11-29 20:59:37 +13:00
Brenda Wallace
9c993e9f47
Plantings controller ordering and specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
d5fece87d0
Tests for comments#index (and bugfix)
2017-11-29 20:59:37 +13:00
Brenda Wallace
33816d4312
Use faker gem, in account types - and add controller specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
00e6aeed5c
seed.tradable was back to front logic. fixed
2017-11-29 20:59:37 +13:00
Brenda Wallace
0205b345d0
A planting's photo is their most recent photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
9f8a32e9f8
Feature plantings need to be ordered
2017-11-29 20:59:37 +13:00
Brenda Wallace
7357524271
Garden's default photo should be the most recent photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
6aa689b0d8
Removed some model ordering specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
962b3b574d
Fixed up planting spec to not care about ordering
2017-11-29 20:59:37 +13:00
Brenda Wallace
d77d1d9a77
spec for notifications needs to be agnostic about the order
2017-11-29 20:59:37 +13:00
Brenda Wallace
4bed6da422
Crop validation methods can be private
2017-11-29 20:59:37 +13:00
Brenda Wallace
023c870d49
Fix up crop.recent
2017-11-29 20:59:37 +13:00
Brenda Wallace
9aff65e956
Added ordering to finding first photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
0446c0a405
Add ordering back into controller #index
2017-11-29 20:59:37 +13:00
Brenda Wallace
7719d1f896
Remote default ordering scopes, and clean up models
2017-11-29 20:59:37 +13:00
Brenda Wallace
17fd6f61a5
Added polymorphic relationship to photos
2017-11-29 20:14:27 +13:00
Brenda Wallace
c9558e4d51
Merge branch 'master' into dev
...
Conflicts:
Gemfile.lock
2017-11-29 10:46:08 +13:00
deppbot
8a679670e4
Bundle Update on 2017-11-29
2017-11-29 07:00:25 +13:00
pozorvlak
a7586e9d2b
Merge pull request #1448 from Br3nda/fix/1211
...
upgrade leaflet-rails
2017-11-27 20:42:22 +00:00
Shiny
811011419e
Exit if we can't cd
2017-11-26 09:39:43 +13:00
Shiny
dae3ea2789
removed some debug
2017-11-25 19:41:41 +13:00
Shiny
49aa6bb846
Update .travis.yml
2017-11-25 19:41:03 +13:00
Brenda Wallace
c154a9b845
Upgraded leaflet maskercluster
2017-11-25 19:34:05 +13:00
Shiny
ad14ecb41b
Merge branch 'dev' into fix/1211
2017-11-25 17:03:23 +13:00
deppbot
08a73ce503
Bundle Update on 2017-11-24
2017-11-25 09:53:29 +13:00
Brenda Wallace
229396d9e7
Add id and type back to photos#new
2017-11-22 22:06:41 +13:00
Daniel O'Connor
0fa02272b0
Merge pull request #1465 from Growstuff/bundle-update-2017-11-21-121132
...
Bundle Update on 2017-11-21
2017-11-22 16:36:46 +10:30
deppbot
a91b8605c4
Bundle Update on 2017-11-21
2017-11-21 12:11:33 +08:00
pozorvlak
f1107b518c
Merge pull request #1460 from Br3nda/fix/gardens-index
...
Fix gardens actions, and add specs
2017-11-20 11:21:07 +00:00
Shiny
52d93a7ccd
Merge branch 'dev' into fix/1211
2017-11-19 18:22:02 +13:00
Brenda Wallace
d3df1e8f33
Move planting's add photo button to _actions.haml
2017-11-19 18:02:09 +13:00
Shiny
eb77715b70
Merge branch 'dev' into fix/gardens-index
2017-11-19 16:35:56 +13:00
Shiny
252910694d
Merge branch 'master' into dev
2017-11-19 16:34:58 +13:00
Brenda Wallace
bd063be3a9
Fix gardens actions, and add specs
...
A bug slipped into all garden display pages - and there were no tests that caught it.
This adds feature specs for gardens#index, which would have detected the un-initialised
variable in haml
2017-11-19 16:31:17 +13:00
Shiny
9a6d827b6d
Merge branch 'dev' into fix/1211
2017-11-19 11:14:09 +13:00
Logan Gingerich
ede5187369
Whitespace fix, spec fix, and spec addition
2017-11-19 11:13:41 +13:00
Logan Gingerich
610a5b7a48
deleted line 70 on plantings view to clean up logic
2017-11-19 11:13:41 +13:00
Logan Gingerich
1fa71c1546
Moved add photo button from garden show view to garden actions
2017-11-19 11:13:41 +13:00
Logan Gingerich
7574eb554e
Adds a more prominent add photo button to garden and planting show views
2017-11-19 11:13:41 +13:00
Shiny
eea7e19ecf
Merge branch 'dev' into fix/1211
2017-11-18 22:27:04 +13:00
Brenda Wallace
dafaffcd73
Path remains same after sign out for our test cases
2017-11-18 22:25:58 +13:00
Brenda Wallace
3e149a5d1d
Feature spec for showing item details on photo adding page
2017-11-18 22:25:58 +13:00
Brenda Wallace
c20d9b78c5
Reduced the tests of signout on photos/new
2017-11-18 22:25:58 +13:00
Brenda Wallace
7906d50d13
Shaved some yaks to remove a rescue from a controller
2017-11-18 22:25:58 +13:00
Brenda Wallace
faed8b019e
Removed rescue in a controller
2017-11-18 22:25:58 +13:00
Brenda Wallace
c8974a869f
Use the ||= operator
2017-11-18 22:25:58 +13:00
Brenda Wallace
3969f410f1
Tidy up photos logic, and test of signin/out on photos#new
2017-11-18 22:25:58 +13:00
Logan Gingerich
6304f230a5
Refactored and specs updated
2017-11-18 22:25:58 +13:00
Logan Gingerich
73524b8883
Now displays correctly for planting, harvest or garden
2017-11-18 22:25:58 +13:00
Logan Gingerich
fd9fc38def
fixes #1433 Says what item you're adding a photo to on photos#new
2017-11-18 22:25:58 +13:00
deppbot
949c7c31d8
Bundle Update on 2017-11-18
2017-11-18 15:27:04 +13:00
pozorvlak
e34dcd03bc
Merge pull request #1454 from pozorvlak/dedeprecate_view_specs
...
De-deprecate controller and view specs
2017-11-17 17:05:07 +00:00
milesgould
d8bf8ae4df
De-deprecate controller and view specs
...
We deprecated controller and view specs on the grounds that they were
brittle, and were a poorer measure of user experience than feature
specs. However, feature specs have their own problems: they're much
slower to run, and flakier (see #901 ). We also ran into a few cases
where feature specs erroneously passed because they were checking for
the presence of a string that occurred in the error page!
Hence, we're cautiously un-deprecating controller and view specs.
Fixes #1132
2017-11-17 16:51:24 +00:00
Shiny
83fea92353
Merge branch 'dev' into fix/1211
2017-11-15 09:27:17 +13:00
Shiny
1317ce9db0
Merge branch 'dev' into fix/1211
2017-11-13 23:08:38 +13:00
Brenda Wallace
e489831241
Debugging phantom on travis
2017-11-13 23:00:05 +13:00
Brenda Wallace
3d4f5c6917
upgrade leaflet-rails
2017-11-13 21:49:00 +13:00