Commit Graph

9833 Commits

Author SHA1 Message Date
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
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
release50
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