1901829f9a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Our config file is pretty different from upstream.
Upstream changed CSP directive `script-src` to include
`wasm-unsafe-eval` instead of `unsafe-eval`, which we
did not include.
Added `wasm-unsafe-eval` to `script-src` to fix
execution of the OCR web worker.
- `package.json`:
Upstream updated a dependency (`array-includes`) textually
adjacent to a glitch-soc-only dependency (`atrament`).
Updated `array-includes` as upstream did.
2022-11-16 08:30:00 +01:00
f7d261cac7
Bump sidekiq from 6.5.7 to 6.5.8 ( #20035 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.5.7 to 6.5.8.
- [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.7...v6.5.8 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-15 23:52:44 +09:00
575bf3fa20
Bump oj from 3.13.21 to 3.13.23 ( #20046 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.21 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.21...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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-15 23:42:59 +09:00
f32c2de6af
Bump pg from 1.4.3 to 1.4.4 ( #19597 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-15 20:49:50 +09:00
fc4452104c
Bump json-ld-preloaded from 3.2.0 to 3.2.2 ( #20058 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.2.0 to 3.2.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.2.0...3.2.2 )
---
updated-dependencies:
- dependency-name: json-ld-preloaded
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-15 20:21:04 +09:00
c76f29ae45
Bump tzinfo-data from 1.2022.4 to 1.2022.6 ( #20056 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2022.4 to 1.2022.6.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2022.4...v1.2022.6 )
---
updated-dependencies:
- dependency-name: tzinfo-data
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-15 20:20:42 +09:00
61264e52cc
Bump memory_profiler from 1.0.0 to 1.0.1 ( #20054 )
...
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases )
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v1.0.0...v1.0.1 )
---
updated-dependencies:
- dependency-name: memory_profiler
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-15 20:19:34 +09:00
b59683c156
Bump nokogiri from 1.13.8 to 1.13.9 ( #20041 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.8 to 1.13.9.
- [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.8...v1.13.9 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-15 03:19:56 +01:00
767630be24
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
Upstream removed blank lines.
2022-11-14 20:27:31 +01:00
21fd25a269
Fix rate limiting for paths with formats ( #20675 )
2022-11-14 20:26:31 +01:00
cb19be67d1
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-28 19:23:58 +02:00
6e1be17b61
Bump stackprof from 0.2.21 to 0.2.22 ( #19367 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.21 to 0.2.22.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.21...v0.2.22 )
---
updated-dependencies:
- dependency-name: stackprof
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-21 19:17:18 +09:00
46224385e2
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-08 15:49:40 +02:00
d84c53e769
Bump sidekiq-scheduler from 4.0.2 to 4.0.3 ( #19314 )
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Changelog](https://github.com/sidekiq-scheduler/sidekiq-scheduler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v4.0.2...v4.0.3 )
---
updated-dependencies:
- dependency-name: sidekiq-scheduler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-08 14:14:13 +09:00
9a685e2f8c
New Crowdin updates ( #19297 )
...
* New translations en.yml (Corsican)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Sinhala)
* New translations en.yml (Asturian)
* New translations activerecord.en.yml (Bulgarian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Finnish)
* New translations activerecord.en.yml (Finnish)
* New translations devise.en.yml (Finnish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Basque)
* New translations devise.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations activerecord.en.yml (Hungarian)
* New translations devise.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations activerecord.en.yml (Armenian)
* New translations devise.en.yml (Armenian)
* New translations devise.en.yml (Basque)
* New translations simple_form.en.yml (Basque)
* New translations devise.en.yml (Bulgarian)
* New translations simple_form.en.yml (Catalan)
* New translations activerecord.en.yml (Catalan)
* New translations devise.en.yml (Catalan)
* New translations devise.en.yml (Czech)
* New translations simple_form.en.yml (Danish)
* New translations activerecord.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations simple_form.en.yml (German)
* New translations activerecord.en.yml (German)
* New translations devise.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations activerecord.en.yml (Greek)
* New translations devise.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations activerecord.en.yml (Frisian)
* New translations devise.en.yml (Frisian)
* New translations simple_form.en.yml (Italian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Polish)
* New translations devise.en.yml (Polish)
* New translations simple_form.en.yml (Portuguese)
* New translations devise.en.yml (Portuguese)
* New translations activerecord.en.yml (Norwegian)
* New translations simple_form.en.yml (Russian)
* New translations activerecord.en.yml (Russian)
* New translations devise.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations activerecord.en.yml (Slovak)
* New translations devise.en.yml (Slovak)
* New translations simple_form.en.yml (Slovenian)
* New translations devise.en.yml (Norwegian)
* New translations simple_form.en.yml (Norwegian)
* New translations devise.en.yml (Italian)
* New translations activerecord.en.yml (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations activerecord.en.yml (Japanese)
* New translations devise.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations activerecord.en.yml (Georgian)
* New translations devise.en.yml (Georgian)
* New translations simple_form.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations devise.en.yml (Dutch)
* New translations activerecord.en.yml (Slovenian)
* New translations devise.en.yml (Slovenian)
* New translations devise.en.yml (Urdu (Pakistan))
* New translations devise.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations devise.en.yml (Ukrainian)
* New translations activerecord.en.yml (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations devise.en.yml (Turkish)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Turkish)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations devise.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations activerecord.en.yml (Swedish)
* New translations devise.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations devise.en.yml (Icelandic)
* New translations activerecord.en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations devise.en.yml (Galician)
* New translations simple_form.en.yml (Galician)
* New translations devise.en.yml (Vietnamese)
* New translations devise.en.yml (Indonesian)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Croatian)
* New translations activerecord.en.yml (Croatian)
* New translations devise.en.yml (Croatian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations devise.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Thai)
* New translations devise.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations activerecord.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations devise.en.yml (Latvian)
* New translations devise.en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Persian)
* New translations activerecord.en.yml (Persian)
* New translations devise.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations activerecord.en.yml (Tamil)
* New translations devise.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations activerecord.en.yml (Bengali)
* New translations devise.en.yml (Bengali)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Hindi)
* New translations devise.en.yml (Malayalam)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Tatar)
* New translations activerecord.en.yml (Tatar)
* New translations devise.en.yml (Tatar)
* New translations simple_form.en.yml (Malayalam)
* New translations activerecord.en.yml (Malayalam)
* New translations simple_form.en.yml (Breton)
* New translations activerecord.en.yml (Breton)
* New translations devise.en.yml (Breton)
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Hindi)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations simple_form.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Corsican)
* New translations devise.en.yml (Corsican)
* New translations simple_form.en.yml (Sardinian)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations devise.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Kabyle)
* New translations activerecord.en.yml (Kabyle)
* New translations devise.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Occitan)
* New translations devise.en.yml (Kannada)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Serbian (Latin))
* New translations devise.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Russian)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Icelandic)
* New translations en.yml (Vietnamese)
* New translations en.yml (Turkish)
* New translations en.yml (Spanish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Czech)
* New translations en.yml (Albanian)
* New translations en.json (Polish)
* New translations en.yml (Polish)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.yml (Thai)
* New translations en.yml (Greek)
* New translations en.yml (Catalan)
* New translations en.yml (Danish)
* New translations en.yml (Hebrew)
* New translations en.yml (Hungarian)
* New translations en.yml (French)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.yml (Spanish)
* New translations en.yml (Turkish)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Slovenian)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Dutch)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Korean)
* New translations en.yml (Polish)
* New translations en.yml (Portuguese)
* New translations en.yml (Russian)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Latvian)
* New translations en.yml (Kurmanji (Kurdish))
* Fix platform-specific code
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-10-08 13:34:58 +09:00
a2ba011326
Change privacy policy to be rendered in web UI, add REST API ( #19310 )
...
Source string no longer localized, Markdown instead of raw HTML
2022-10-08 06:01:11 +02:00
971279efa8
Bump rspec_junit_formatter from 0.5.1 to 0.6.0 ( #19286 )
...
Bumps [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter ) from 0.5.1 to 0.6.0.
- [Release notes](https://github.com/sj26/rspec_junit_formatter/releases )
- [Changelog](https://github.com/sj26/rspec_junit_formatter/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sj26/rspec_junit_formatter/compare/v0.5.1...v0.6.0 )
---
updated-dependencies:
- dependency-name: rspec_junit_formatter
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 20:57:31 +09:00
221580a3af
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/home_controller.rb`:
Upstream made it so `/web` is available to non-logged-in users
and `/` redirects to `/web` instead of `/about`.
Kept our version since glitch-soc's WebUI doesn't have what's
needed yet and I think /about is still a much better landing
page anyway.
- `app/models/form/admin_settings.rb`:
Upstream added new settings, and glitch-soc had an extra setting.
Not really a conflict.
Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
Upstream added a new `server` initial state object.
Not really a conflict.
Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
Upstream added new settings.
Not really a conflict.
Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
Upstream refactored that part and removed the file.
Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
Upstream added new settings.
Not a real conflict.
Added upstream's new settings.
2022-10-02 18:46:22 +02:00
1d5196918a
Bump tzinfo-data from 1.2022.3 to 1.2022.4 ( #19238 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2022.3 to 1.2022.4.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2022.3...v1.2022.4 )
---
updated-dependencies:
- dependency-name: tzinfo-data
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-28 02:31:33 +09:00
911951e776
Bump connection_pool from 2.2.5 to 2.3.0 ( #19202 )
...
Bumps [connection_pool](https://github.com/mperham/connection_pool ) from 2.2.5 to 2.3.0.
- [Release notes](https://github.com/mperham/connection_pool/releases )
- [Changelog](https://github.com/mperham/connection_pool/blob/main/Changes.md )
- [Commits](https://github.com/mperham/connection_pool/compare/v2.2.5...v2.3.0 )
---
updated-dependencies:
- dependency-name: connection_pool
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-24 19:55:44 +09:00
bec214d090
Bump httplog from 1.5.0 to 1.6.0 ( #19192 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/commits )
---
updated-dependencies:
- dependency-name: httplog
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-24 19:38:46 +09:00
be05e6a37d
Bump sidekiq from 6.5.6 to 6.5.7 ( #19210 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.5.6 to 6.5.7.
- [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.6...v6.5.7 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-24 19:37:14 +09:00
1cc32dd50c
Bump i18n-tasks from 1.0.11 to 1.0.12 ( #19195 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-21 20:24:53 +09:00
0aacf00f5b
Bump rails from 6.1.6.1 to 6.1.7 ( #19164 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.6.1 to 6.1.7.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.6.1...v6.1.7 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-11 23:12:25 +09:00
f84adc2ccf
Bump doorkeeper from 5.5.4 to 5.6.0 ( #19163 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.5.4 to 5.6.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.5.4...v5.6.0 )
---
updated-dependencies:
- dependency-name: doorkeeper
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-11 22:23:56 +09:00
103cec2302
Bump faker from 2.22.0 to 2.23.0 ( #19123 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.22.0 to 2.23.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.22.0...v2.23.0 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-11 21:53:33 +09:00
5073a755d7
Bump rails from 6.1.6 to 6.1.6.1 ( #18831 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-01 01:16:06 +09:00
dcd81f05bc
Bump sidekiq from 6.5.5 to 6.5.6 ( #19081 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.5.5 to 6.5.6.
- [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...v6.5.6 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-01 01:15:32 +09:00
077183a121
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
Upstream dropping `digest` from notifications emails while we have more
notification emails settings.
Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
Conflicts caused by glitch-soc's theming system.
Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream removed a setting close to a glitch-soc-only setting.
Applied upstream's change.
2022-08-28 11:31:00 +02:00
3c79ccb7e3
Bump addressable from 2.8.0 to 2.8.1 ( #19033 )
...
Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.8.0 to 2.8.1.
- [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.8.0...addressable-2.8.1 )
---
updated-dependencies:
- dependency-name: addressable
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-26 03:57:41 +09:00
c36262c914
Bump oj from 3.13.20 to 3.13.21 ( #19031 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.20 to 3.13.21.
- [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.21 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-26 03:57:01 +09:00
99aed9069d
Bump puma from 5.6.4 to 5.6.5 ( #19042 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.6.4 to 5.6.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/compare/v5.6.4...v5.6.5 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-25 20:10:43 +02:00
2d1d4210f9
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-25 05:07:39 +02:00
115b8311c1
Bump sidekiq from 6.5.4 to 6.5.5 ( #19030 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-25 09:57:16 +09:00
b21aa82803
Bump stackprof from 0.2.20 to 0.2.21 ( #19027 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.20 to 0.2.21.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.20...v0.2.21 )
---
updated-dependencies:
- dependency-name: stackprof
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-25 09:54:36 +09:00
0b37299775
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-21 14:39:25 +02:00
5920d8fe33
Bump omniauth from 1.9.1 to 1.9.2 ( #19006 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 18:53:42 +09:00
a6dc606d52
Bump webmock from 3.17.0 to 3.18.1 ( #19007 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.17.0 to 3.18.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.17.0...v3.18.1 )
---
updated-dependencies:
- dependency-name: webmock
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 09:27:53 +09:00
99f6be3b60
Bump pg from 1.4.2 to 1.4.3 ( #18986 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 09:06:15 +09:00
a7c280f93a
Bump redis-namespace from 1.8.2 to 1.9.0 ( #18987 )
...
Bumps [redis-namespace](https://github.com/resque/redis-namespace ) from 1.8.2 to 1.9.0.
- [Release notes](https://github.com/resque/redis-namespace/releases )
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md )
- [Commits](https://github.com/resque/redis-namespace/compare/v1.8.2...v1.9 )
---
updated-dependencies:
- dependency-name: redis-namespace
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 09:06:07 +09:00
5935e61306
Bump pry-byebug from 3.9.0 to 3.10.1 ( #19002 )
...
Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug ) from 3.9.0 to 3.10.1.
- [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.9.0...v3.10.1 )
---
updated-dependencies:
- dependency-name: pry-byebug
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 08:58:16 +09:00
71d403230e
Bump brakeman from 5.2.3 to 5.3.1 ( #18985 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.2.3 to 5.3.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/commits )
---
updated-dependencies:
- dependency-name: brakeman
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 08:55:18 +09:00
a220c84181
Bump sidekiq from 6.5.3 to 6.5.4 ( #18982 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 08:54:31 +09:00
96fdbdb0ad
Bump webmock from 3.17.0 to 3.17.1 ( #18988 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.17.0 to 3.17.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.17.0...v3.17.1 )
---
updated-dependencies:
- dependency-name: webmock
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 08:53:37 +09:00
0a3c0cbff7
Bump bullet from 7.0.2 to 7.0.3 ( #18984 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 08:53:28 +09:00
86b3649204
Bump tzinfo-data from 1.2022.1 to 1.2022.3 ( #19003 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2022.1 to 1.2022.3.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2022.1...v1.2022.3 )
---
updated-dependencies:
- dependency-name: tzinfo-data
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-19 08:52:05 +09:00
461239db5d
Fix backend compatibility with OpenSSL 3.0 ( #18449 )
...
* Update webpush to fork with OpenSSL 3 compatibility
* Fix tests with OpenSSL 3.0
* Update webauthn gem to latest release and update dependencies
2022-08-17 22:06:48 +01:00
e2a7a458d6
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-15 14:33:05 +02:00
c384430ba0
Bump capistrano from 3.17.0 to 3.17.1 ( #18949 )
...
* Bump capistrano from 3.17.0 to 3.17.1
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.17.0 to 3.17.1.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.17.0...v3.17.1 )
---
updated-dependencies:
- dependency-name: capistrano
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* 3.17.1
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-08-15 07:50:50 +09:00
1abf2a0584
Bump oj from 3.13.19 to 3.13.20 ( #18948 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-15 07:43:22 +09:00
Claire
dependabot[bot]
Eugen Rochko