572ae35d31
Bump faker from 3.0.0 to 3.1.0 ( #22762 )
...
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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-27 09:35:54 +09:00
54920be04d
Merge branch 'main' into glitch-soc/merge-upstream
2022-12-21 15:59:39 +01:00
ab1b4adedf
Bump scenic from 1.6.0 to 1.7.0 ( #22258 )
...
Bumps [scenic](https://github.com/scenic-views/scenic ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/scenic-views/scenic/releases )
- [Changelog](https://github.com/scenic-views/scenic/blob/main/CHANGELOG.md )
- [Commits](https://github.com/scenic-views/scenic/compare/v1.6.0...v1.7.0 )
---
updated-dependencies:
- dependency-name: scenic
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-12-20 19:10:09 +09:00
20253b71f3
Bump pundit from 2.2.0 to 2.3.0 ( #22516 )
...
Bumps [pundit](https://github.com/varvet/pundit ) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/varvet/pundit/releases )
- [Changelog](https://github.com/varvet/pundit/blob/main/CHANGELOG.md )
- [Commits](https://github.com/varvet/pundit/commits )
---
updated-dependencies:
- dependency-name: pundit
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-12-20 19:08:53 +09:00
3f8f8982ce
Bump fog-core from 2.1.0 to 2.3.0 ( #22521 )
...
Bumps [fog-core](https://github.com/fog/fog-core ) from 2.1.0 to 2.3.0.
- [Release notes](https://github.com/fog/fog-core/releases )
- [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md )
- [Commits](https://github.com/fog/fog-core/compare/v2.1.0...v2.3.0 )
---
updated-dependencies:
- dependency-name: fog-core
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-12-20 19:08:22 +09:00
f23d971cd8
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
d0fb555876
linting: RuboCop update, config fixes ( #20574 )
...
* fix(rubocop): update gems and add performance and rspec
fix(rubocop): update gems and add performance and rspec
- update present rubocop gems
- add rubocop-rspec and rubocop-performance gems
- move rubocop gems to gem group :development, :test in order to
make linting in a github action that runs with RAILS_ENV=test possible
* feat(rubocop): disable some annoyance RSpec cops
To mee these prooved to be more annoying than helpful.
If not agreed, they can be enabled any time.
* fix(rubocop): do not ignore spec/**/*
Because rubocop-rspec should lint the specs as well, and they
deserve to be readable in general. It is relevant code, after all.
* fix(rubocop): change ignore db/**/* to db/schema.rb
because rails cops do some lints for migrations.
E.g. reversable migrations linting and more.
* fix(rubocop): tune rules configs
Bunch of commits squashed:
fix(rubocop): enable Layout/LineLength cop
Because this project has code with line lenghts > 500 chars.
This is not good practice at all, so I strongly suggest to
change the practice in the future.
But allow heredoc, URI and comments to still be long lines
and make the default Max: 120 explicit, by repeating it in the
config. To me this max length seems reasonable. Perhaps
a bit more could be ok for some. But > 500 chars in one line
Seems to be way too long IMHO.
fix(rubocop): Metrics/CyclomaticComplexity Max to 12
The default is 7, perhaps quite strict. But 25 is too loose,
the rule becomes pointless like that.
fix(rubocop): AllCops ruby version, cacheing and more info
- fix the target ruby version from 2.5 to 3.0
- have the cop error messages to be more informative and helpful
- enable cacheing in /tmp
fix(rubocop): Metrics/AbcSize to 34 from 115
Rubocops default is 17. If the rule is at 115 is becomes
pointless.
fix(rubocop): Metrics/BlockLength improvements
- instead of ignoring tasks completely, ignore only the
long blocks that are specific to tasks (task, namespace)
- ignore also concern specific block methods (included, class_methods)
fix(rubocop): Metrics/ClassLength count heredoc array as one line
fix(rubocop): Metrics/MethodLength Max to 25
- the default is 10, but 65 is too loose, so perhaps 25?
fix(rubocop): Metrics/ModuleLength array and heredoc count as one
fix(rubocop): Metrics/PerceivedComplexity to 16 from 25
Rubocops default is 8, so how about only doubling that, instead
of > than tripple it?
fix(rubocop): enable Style/RedundantAssignment
Because I think that this rule would never really hurt,
but improve code quality and readability.
fix(rubocop): enable Style/RescueStandardError
I think everyone that ever had to debug what this can bring
will hopefully agree that this rule totally makes sense.
In the super rare exeptions where this is totally needed,
it can be excluded by disabling comment in that place.
fix(rubocop): Metrics/ParameterLists add explicit defaults and some excludes
2022-12-15 16:39:59 +01:00
ad2610c413
Validate nodeinfo response by schema ( #21395 )
...
* add json-schema to :test in Gemfile
* Create node_info_2.0_schema.json
* test match_response_schema
* Create match_response_schema.rb
* Update nodeinfo_controller_spec.rb
* Rename spec/support/node_info_2.0_schema.json to spec/support/schema/node_info_2.0_schema.json
* Update match_response_schema.rb
* cleanup
* additionally validate the json schema itself
disable throwing errors
test the schema matcher
* rename nodeinfo schema to nodeinfo_2.0
* use Rails.root.join to construct the path
* prettify json
* sync Gemfile.lock
2022-12-15 15:43:05 +01:00
aec7de494f
Fix unbounded recursion in account discovery ( #22025 )
...
* Fix trying to fetch posts from other users when fetching featured posts
* Rate-limit discovery of new subdomains
* Put a limit on recursively discovering new accounts
2022-12-07 00:15:24 +01:00
afa828e3d4
Fix unbounded recursion in account discovery ( #1994 )
...
* Fix trying to fetch posts from other users when fetching featured posts
* Rate-limit discovery of new subdomains
* Put a limit on recursively discovering new accounts
2022-12-04 21:23:19 +01:00
0acb29fe9c
Merge branch 'main' into glitch-soc/merge-upstream
2022-12-04 17:22:57 +01:00
76daaafd20
Bump faker from 2.23.0 to 3.0.0 ( #20039 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.23.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.23.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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-03 01:06:41 +09:00
aa15e817ce
Bump stoplight from 3.0.0 to 3.0.1 ( #21953 )
...
Bumps [stoplight](https://github.com/orgsync/stoplight ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/orgsync/stoplight/releases )
- [Changelog](https://github.com/bolshakov/stoplight/blob/master/CHANGELOG.md )
- [Commits](https://github.com/orgsync/stoplight/commits )
---
updated-dependencies:
- dependency-name: stoplight
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-12-02 23:39:41 +09:00
ed213280df
Bump pkg-config from 1.4.9 to 1.5.1 ( #21820 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.4.9 to 1.5.1.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.9...1.5.1 )
---
updated-dependencies:
- dependency-name: pkg-config
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-12-02 23:31:29 +09:00
e572738f0f
Bump bootsnap from 1.14.0 to 1.15.0 ( #21810 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.14.0...v1.15.0 )
---
updated-dependencies:
- dependency-name: bootsnap
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-12-02 23:11:07 +09:00
b7a970a5ba
Bump aws-sdk-s3 from 1.114.0 to 1.117.1 ( #20043 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.114.0 to 1.117.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
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-12-02 23:07:28 +09:00
02992b262a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README is completely different.
Discarded upstream changes.
2022-11-28 11:33:34 +01:00
daf52f6c69
Remove support for Ruby 2.6 ( #21477 )
...
As pointed out by https://github.com/mastodon/mastodon/pull/21297#discussion_r1028372193
at least one of our dependencies already dropped support for Ruby 2.6, and we
had removed Ruby 2.6 tests from the CI over a year ago (#16861 ).
So stop advertising Ruby 2.6 support, bump targeted version, and drop some
compatibility code.
2022-11-27 20:41:39 +01:00
3689be5127
Bump capybara from 3.37.1 to 3.38.0 ( #20036 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.37.1 to 3.38.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.37.1...3.38.0 )
---
updated-dependencies:
- dependency-name: capybara
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-11-26 13:51:53 +09:00
d777c4bf31
Bump brakeman from 5.3.1 to 5.4.0 ( #21351 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.3.1 to 5.4.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.3.1...v5.4.0 )
---
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-11-26 13:34:19 +09:00
21f24c878c
Bump bootsnap from 1.13.0 to 1.14.0 ( #21344 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.13.0...v1.14.0 )
---
updated-dependencies:
- dependency-name: bootsnap
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-11-26 13:25:53 +09:00
62fd757156
Bump httplog from 1.6.0 to 1.6.2 ( #21345 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.6.0 to 1.6.2.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.6.0...v1.6.2 )
---
updated-dependencies:
- dependency-name: httplog
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-22 23:08:20 +09:00
699db5f2af
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
Upstream removed blank lines.
2022-11-14 20:27:31 +01:00
e18c8537e6
Fix rate limiting for paths with formats ( #20675 )
2022-11-14 20:26:31 +01:00
997553a99e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
2022-11-14 08:35:55 +01:00
8c812d40ba
Clean up GitHub sourced gem entry ( #20542 )
2022-11-13 21:00:38 +01:00
0060eb5dcf
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-28 19:23:58 +02:00
71b32561e9
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-08 15:49:40 +02:00
378e00b59c
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
f208809615
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
a4fc7ac922
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
7da3074578
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
cecc816e93
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
921ca48c9c
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
1dc27c2867
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
6574050b4b
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-21 14:39:25 +02:00
99c93abe12
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
a2662afdf0
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
3149686441
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
965c66af78
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
3b21b1e7bc
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
fd0c34e13f
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-15 14:33:05 +02:00
8676a508f1
Bump webmock from 3.14.0 to 3.17.0 ( #18935 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.14.0 to 3.17.0.
- [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.14.0...v3.17.0 )
---
updated-dependencies:
- dependency-name: webmock
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-06 16:28:09 +09:00
2b414f4d73
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-01 17:47:02 +02:00
889b766841
Bump dotenv-rails from 2.7.6 to 2.8.1 ( #18898 )
...
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:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-30 01:39:38 +09:00
835bf60648
Bump bootsnap from 1.12.0 to 1.13.0 ( #18902 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.12.0 to 1.13.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.12.0...v1.13.0 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-30 01:29:43 +09:00
4278ac2245
Bump fabrication from 2.29.0 to 2.30.0 ( #18901 )
...
Bumps [fabrication](https://gitlab.com/fabrication-gem/fabrication/ ) from 2.29.0 to 2.30.0.
- [Release notes](https://gitlab.com/fabrication-gem/fabrication//tags )
- [Commits](https://gitlab.com/fabrication-gem/fabrication//compare/2.29.0...2.30.0 )
---
updated-dependencies:
- dependency-name: fabrication
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-30 01:27:12 +09:00
68c81337e8
Bump faker from 2.21.0 to 2.22.0 ( #18899 )
...
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-30 01:16:28 +09:00
b50ab06371
Merge branch 'main' into glitch-soc/merge-upstream
...
- `.env.production.sample`:
Our sample config file is very different from upstream since it is much more
complete. Upstream added documentation for a few env variables.
Copied the new variables/documentation from upstream.
- `app/lib/feed_manager.rb`:
Upstream added a timeline type (hashtags), while glitch-soc already had an
extra one (direct messages). Not really a conflict but textually close
changes.
Ported upstream's changes.
- `app/models/custom_emoji.rb`:
Upstream upped the custom emoji size limit, while glitch-soc had configurable
limits.
Upped the default limits accordingly.
- `streaming/index.js`:
Upstream reworked how hastags were normalized. Minor conflict due to
glitch-soc's handling of instance-local posts.
Ported upstream's changes.
2022-07-17 22:07:20 +02:00
68d2465a7a
Bump rack from 2.2.3.1 to 2.2.4 ( #18768 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.2.3.1 to 2.2.4.
- [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.1...2.2.4 )
---
updated-dependencies:
- dependency-name: rack
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-06 09:54:41 +09:00
5832900427
Bump gitlab-omniauth-openid-connect from 0.9.1 to 0.10.0 ( #18574 )
...
Bumps [gitlab-omniauth-openid-connect](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect ) from 0.9.1 to 0.10.0.
- [Release notes](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/tags )
- [Changelog](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/blob/master/CHANGELOG.md )
- [Commits](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/compare/v0.9.1...v0.10.0 )
---
updated-dependencies:
- dependency-name: gitlab-omniauth-openid-connect
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-06 09:44:02 +09:00
8bcebafef8
Bump sidekiq from 6.4.2 to 6.5.1 ( #18672 )
...
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-06 09:11:00 +09:00
301299d036
Merge branch 'main' into glitch-soc/merge-upstream
2022-07-03 21:36:15 +02:00
7bc4328233
Bump fabrication from 2.28.0 to 2.29.0 ( #18726 )
...
Bumps [fabrication](https://gitlab.com/fabrication-gem/fabrication ) from 2.28.0 to 2.29.0.
- [Release notes](https://gitlab.com/fabrication-gem/fabrication/tags )
- [Changelog](https://gitlab.com/fabrication-gem/fabrication/blob/master/Changelog.markdown )
- [Commits](https://gitlab.com/fabrication-gem/fabrication/compare/2.28.0...2.29.0 )
---
updated-dependencies:
- dependency-name: fabrication
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-30 02:31:10 +09:00
490417762f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Fix erroneous deletion in a previous merge.
- `Gemfile`:
Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
90e5a9bd98
Revamp post filtering system ( #18058 )
...
* Add model for custom filter keywords
* Use CustomFilterKeyword internally
Does not change the API
* Fix /filters/edit and /filters/new
* Add migration tests
* Remove whole_word column from custom_filters (covered by custom_filter_keywords)
* Redesign /filters
Instead of a list, present a card that displays more information and handles
multiple keywords per filter.
* Redesign /filters/new and /filters/edit to add and remove keywords
This adds a new gem dependency: cocoon, as well as a npm dependency:
cocoon-js-vanilla. Those are used to easily populate and remove form fields
from the user interface when manipulating multiple keyword filters at once.
* Add /api/v2/filters to edit filter with multiple keywords
Entities:
- `Filter`: `id`, `title`, `filter_action` (either `hide` or `warn`), `context`
`keywords`
- `FilterKeyword`: `id`, `keyword`, `whole_word`
API endpoits:
- `GET /api/v2/filters` to list filters (including keywords)
- `POST /api/v2/filters` to create a new filter
`keywords_attributes` can also be passed to create keywords in one request
- `GET /api/v2/filters/:id` to read a particular filter
- `PUT /api/v2/filters/:id` to update a new filter
`keywords_attributes` can also be passed to edit, delete or add keywords in
one request
- `DELETE /api/v2/filters/:id` to delete a particular filter
- `GET /api/v2/filters/:id/keywords` to list keywords for a filter
- `POST /api/v2/filters/:filter_id/keywords/:id` to add a new keyword to a
filter
- `GET /api/v2/filter_keywords/:id` to read a particular keyword
- `PUT /api/v2/filter_keywords/:id` to edit a particular keyword
- `DELETE /api/v2/filter_keywords/:id` to delete a particular keyword
* Change from `irreversible` boolean to `action` enum
* Remove irrelevent `irreversible_must_be_within_context` check
* Fix /filters/new and /filters/edit with update for filter_action
* Fix Rubocop/Codeclimate complaining about task names
* Refactor FeedManager#phrase_filtered?
This moves regexp building and filter caching to the `CustomFilter` class.
This does not change the functional behavior yet, but this changes how the
cache is built, doing per-custom_filter regexps so that filters can be matched
independently, while still offering caching.
* Perform server-side filtering and output result in REST API
* Fix numerous filters_changed events being sent when editing multiple keywords at once
* Add some tests
* Use the new API in the WebUI
- use client-side logic for filters we have fetched rules for.
This is so that filter changes can be retroactively applied without
reloading the UI.
- use server-side logic for filters we haven't fetched rules for yet
(e.g. network error, or initial timeline loading)
* Minor optimizations and refactoring
* Perform server-side filtering on the streaming server
* Change the wording of filter action labels
* Fix issues pointed out by linter
* Change design of “Show anyway” link in accordence to review comments
* Drop “irreversible” filtering behavior
* Move /api/v2/filter_keywords to /api/v1/filters/keywords
* Rename `filter_results` attribute to `filtered`
* Rename REST::LegacyFilterSerializer to REST::V1::FilterSerializer
* Fix systemChannelId value in streaming server
* Simplify code by removing client-side filtering code
The simplifcation comes at a cost though: filters aren't retroactively
applied anymore.
2022-06-28 09:42:13 +02:00
0c87562143
Bump pg from 1.3.5 to 1.4.0 ( #18695 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.3.5 to 1.4.0.
- [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.5...v1.4.0 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-27 20:55:18 +09:00
95845f8311
Bump http from 5.0.4 to 5.1.0 ( #18696 )
...
Bumps [http](https://github.com/httprb/http ) from 5.0.4 to 5.1.0.
- [Release notes](https://github.com/httprb/http/releases )
- [Changelog](https://github.com/httprb/http/blob/main/CHANGES.md )
- [Commits](https://github.com/httprb/http/compare/v5.0.4...v5.1.0 )
---
updated-dependencies:
- dependency-name: http
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-27 20:54:46 +09:00
dc250cb7f3
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Changed upstream, while we modified it in glitch-soc to not get spammed
by dependabot.
Kept it removed.
- `README.md`:
Changed upstream, which has a very different version.
Discarded upstream changes.
2022-06-21 08:28:59 +02:00
57a856325e
Bump rubocop-rails from 2.14.2 to 2.15.0 ( #18681 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.14.2 to 2.15.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.14.2...v2.15.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-19 14:43:21 +09:00
323f1c24ad
Bump bootsnap from 1.11.1 to 1.12.0 ( #18575 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.11.1 to 1.12.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.11.1...v1.12.0 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-11 21:54:45 +09:00
3b4abfe132
Merge branch 'main' into glitch-soc/merge-upstream
2022-06-10 11:51:43 +02:00
e31068ed44
Bump simple-navigation from 4.3.0 to 4.4.0 ( #18576 )
...
Bumps [simple-navigation](https://github.com/codeplant/simple-navigation ) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/codeplant/simple-navigation/releases )
- [Changelog](https://github.com/codeplant/simple-navigation/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeplant/simple-navigation/compare/v4.3.0...v4.4.0 )
---
updated-dependencies:
- dependency-name: simple-navigation
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-03 12:53:13 +09:00
b383586e33
Bump rubocop from 1.29.1 to 1.30.0 ( #18577 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.29.1 to 1.30.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.29.1...v1.30.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-03 12:50:53 +09:00
a864904fad
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/models/account.rb`:
Textual conflict only caused by glitch-soc using a different value
for character limits in a nearby line.
Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
Attribute added to a tag modified by glitch-soc.
Added upstream's attributes.
- `yarn.lock`:
Upstream added/updated dependencies close to glitch-soc-only ones.
Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
4f598a0f18
Bump microformats from 4.3.1 to 4.4.1 ( #18500 )
...
Bumps [microformats](https://github.com/microformats/microformats-ruby ) from 4.3.1 to 4.4.1.
- [Release notes](https://github.com/microformats/microformats-ruby/releases )
- [Commits](https://github.com/microformats/microformats-ruby/compare/v4.3.1...v4.4.1 )
---
updated-dependencies:
- dependency-name: microformats
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-29 22:28:07 +09:00
eada1864ef
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-24 13:59:21 +02:00
f4cab3ebad
Change search indexing to use batches to minimize resource usage ( #18451 )
2022-05-18 23:29:14 +02:00
43da7aec15
Bump rubocop from 1.28.2 to 1.29.1 ( #18433 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.28.2 to 1.29.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.28.2...v1.29.1 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-19 03:27:55 +09:00
596a8e335d
Bump faker from 2.20.0 to 2.21.0 ( #18434 )
...
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-19 03:27:02 +09:00
fbfa953ad2
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/remove_status_service.rb`:
Conflict due to glitch-soc having extra code for a proper direct visibility
timeline, in a part of the code upstream refactored.
Restored glitch-soc's extra code in the refactored bit.
2022-05-16 09:42:32 +02:00
ef5cb713ea
Bump rails from 6.1.5.1 to 6.1.6 ( #18372 )
...
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-12 10:54:27 +09:00
9a91bf86e9
Bump aws-sdk-s3 from 1.113.2 to 1.114.0 ( #18373 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.113.2 to 1.114.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-12 10:42:52 +09:00
c6e7c928ab
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, upstream updated a dependency textually adjacent to a
glitch-soc-only one.
Updated the dependency as upstream did.
2022-05-11 09:37:48 +02:00
5bedcdbe87
Bump capybara from 3.36.0 to 3.37.1 ( #18376 )
...
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 04:01:16 +09:00
6f69b831d6
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-08 21:00:49 +02:00
221959d36a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated `jest`, moving its config in a separate file.
This config was modified in glitch-soc, so the corresponding changes have
been ported to `jest.config.js`
2022-05-04 19:15:50 +02:00
cde543ac9c
Bump sidekiq-scheduler from 3.2.0 to 4.0.0 ( #18275 )
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 3.2.0 to 4.0.0.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Changelog](https://github.com/moove-it/sidekiq-scheduler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.2.0...v4.0.0 )
---
updated-dependencies:
- dependency-name: sidekiq-scheduler
dependency-type: direct:production
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-05-04 22:47:05 +09:00
071187d21d
Bump stoplight from 2.2.1 to 3.0.0 ( #17645 )
...
Bumps [stoplight](https://github.com/orgsync/stoplight ) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/orgsync/stoplight/releases )
- [Changelog](https://github.com/bolshakov/stoplight/blob/master/CHANGELOG.md )
- [Commits](https://github.com/orgsync/stoplight/compare/v2.2.1...v3.0.0 )
---
updated-dependencies:
- dependency-name: stoplight
dependency-type: direct:production
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-05-04 22:33:19 +09:00
b95a48d2c2
Bump rubocop from 1.27.0 to 1.28.2 ( #18084 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.27.0 to 1.28.2.
- [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.27.0...v1.28.2 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-04 13:43:02 +09:00
95f0a6553a
Bump minimum Ruby version ( #18294 )
...
Mastodon has been incompatible with Ruby 2.5 for a few releases due to
some dependencies, this just updates the Gemfile description to match
that situation.
2022-05-04 00:26:46 +02:00
0069bebafe
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-25 17:09:32 +02:00
773b76fb42
Bump sidekiq-scheduler from 3.1.1 to 3.2.0 ( #18052 )
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Changelog](https://github.com/moove-it/sidekiq-scheduler/blob/v3.2.0/CHANGELOG.md )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.1.1...v3.2.0 )
---
updated-dependencies:
- dependency-name: sidekiq-scheduler
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-22 02:33:04 +09:00
52fd2a4cc3
Bump rubocop from 1.26.1 to 1.27.0 ( #18019 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.26.1 to 1.27.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.26.1...v1.27.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-16 15:28:04 +09:00
9c7a6afbf6
Bump bootsnap from 1.10.3 to 1.11.1 ( #17778 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.10.3 to 1.11.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.10.3...v1.11.1 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-14 21:33:11 +09:00
d4f25d52dd
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, just an upstream dependency udpated
textually too close to a glitch-soc-only dependency.
Updated dependencies like upstream.
- `app/controllers/settings/preferences_controller.rb`:
Upstream added settings where we had extra glitch-soc-specific settings.
Added upstream's new settings.
- `app/models/user.rb`:
Upstream added settings where we had extra glitch-soc-specific settings.
Added upstream's new settings.
- `config/i18n-tasks.yml`:
Not a real conflict, just a new upstream line too textually close to
a glitch-soc-only line.
Ported upstream's change.
2022-04-08 19:53:32 +02:00
9de4369d43
Bump i18n-tasks from 0.9.37 to 1.0.8 ( #17993 )
...
* Bump i18n-tasks from 0.9.37 to 1.0.8
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.37 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/v0.9.37...v1.0.8 )
---
updated-dependencies:
- dependency-name: i18n-tasks
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* Run `bundle exec i18n-tasks normalize`
* Add `admin_mailer.new_appeal.actions.*` to ignore_unused
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-04-08 20:14:50 +09:00
483af27d41
Bump gitlab-omniauth-openid-connect from 0.5.0 to 0.9.1 ( #17779 )
...
Bumps [gitlab-omniauth-openid-connect](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect ) from 0.5.0 to 0.9.1.
- [Release notes](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/tags )
- [Changelog](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/blob/master/CHANGELOG.md )
- [Commits](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/compare/v0.5.0...v0.9.1 )
---
updated-dependencies:
- dependency-name: gitlab-omniauth-openid-connect
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-08 13:44:40 +09:00
d2ba407fda
Bump fabrication from 2.27.0 to 2.28.0 ( #17960 )
...
Bumps [fabrication](https://gitlab.com/fabrication-gem/fabrication ) from 2.27.0 to 2.28.0.
- [Release notes](https://gitlab.com/fabrication-gem/fabrication/tags )
- [Changelog](https://gitlab.com/fabrication-gem/fabrication/blob/master/Changelog.markdown )
- [Commits](https://gitlab.com/fabrication-gem/fabrication/compare/2.27.0...2.28.0 )
---
updated-dependencies:
- dependency-name: fabrication
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-08 13:40:23 +09:00
fd675d9fff
Bump lograge from 0.11.2 to 0.12.0 ( #17961 )
...
Bumps [lograge](https://github.com/roidrage/lograge ) from 0.11.2 to 0.12.0.
- [Release notes](https://github.com/roidrage/lograge/releases )
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md )
- [Commits](https://github.com/roidrage/lograge/compare/v0.11.2...v0.12.0 )
---
updated-dependencies:
- dependency-name: lograge
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-08 13:40:05 +09:00
bdaf4179b3
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-30 13:40:10 +02:00
ec72db60e2
Bump capistrano from 3.16.0 to 3.17.0 ( #17774 )
...
* Bump capistrano from 3.16.0 to 3.17.0
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.16.0 to 3.17.0.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.16.0...v3.17.0 )
---
updated-dependencies:
- dependency-name: capistrano
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* 3.17.0
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-29 18:49:00 +09:00
f56a3dc4e2
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream modified it, but we deleted it in glitch-soc.
Keep it deleted.
2022-03-22 17:00:38 +01:00
8ec5dd3e79
Bump letter_opener from 1.7.0 to 1.8.1 ( #17838 )
...
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-22 11:30:45 +09:00
9b5cc5c86c
Bump tzinfo-data from 1.2021.5 to 1.2022.1 ( #17839 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2021.5 to 1.2022.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2021.5...v1.2022.1 )
---
updated-dependencies:
- dependency-name: tzinfo-data
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-22 11:30:32 +09:00
bf4cad4a67
Bump rubocop from 1.25.1 to 1.26.0 ( #17789 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.25.1 to 1.26.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.25.1...v1.26.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-18 09:51:58 +09:00
755ef94fed
Bump rubocop-rails from 2.13.2 to 2.14.0 ( #17790 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.13.2 to 2.14.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.13.2...v2.14.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-18 09:34:57 +09:00
24c1b04f9c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our README.
2022-03-15 20:45:27 +01:00
d28213ae72
Bump rails from 6.1.4.6 to 6.1.5 ( #17791 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.4.6 to 6.1.5.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.4.6...v6.1.5 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 14:05:20 +09:00
f9d00306e0
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-12 11:51:25 +01:00
0bc38b0a8a
Bump rack-attack from 6.5.0 to 6.6.0 ( #17405 )
...
* Bump rack-attack from 6.5.0 to 6.6.0
Bumps [rack-attack](https://github.com/rack/rack-attack ) from 6.5.0 to 6.6.0.
- [Release notes](https://github.com/rack/rack-attack/releases )
- [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack-attack/compare/v6.5.0...v6.6.0 )
---
updated-dependencies:
- dependency-name: rack-attack
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Fix usage of deprecated API
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-03-12 09:23:53 +01:00
f677c1619a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream updated media and edit-related code textually close to glitch-soc
additions (local-only and content-type).
Ported upstream changes.
- `app/models/status_edit.rb`:
Upstream changes textually close to glitch-soc additions (content-type).
Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
Upstream changed how media attachments are handled. Not really a conflict,
but textually close to glitch-soc additions (directMessage attribute).
Ported upstream changes.
- `app/services/remove_status_service.rb`:
Upstream changed how media attachments are handled. Not really a conflict,
but textually close to glitch-soc additions (DM timeline).
Ported upstream changes.
- `app/services/update_status_service.rb`:
Upstream fixed an issue with language selection. Not really a conflict,
but textually close to glitch-soc additions (content-type).
Ported upstream changes.
- `db/schema.rb`:
Upstream added columns to the `status_edits` table, the conflict is because
of an additional column (`content-type`) in glitch-soc.
Ported upstream changes.
- `package.json`:
Upstream dependency (express) textually adjacent to a glitch-soc-specific one
(favico.js) got updated.
Updated it as well.
2022-03-10 09:52:45 +01:00
e01af6f018
Bump faker from 2.19.0 to 2.20.0 ( #17716 )
...
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:30:35 +09:00
ce5bebf108
Allow login through OpenID Connect ( #16221 )
...
* added OpenID Connect as an SSO option
* minor fixes
* added comments, removed an option that shouldn't be set
* fixed Gemfile.lock
* added newline to end of Gemfile.lock
* removed tab from Gemfile.lock
* remove chomp
* codeclimate changes and small name change to make function's purpose clearer
* codeclimate fix
* added SSO buttons to /about page
* minor refactor
* minor style change
* removed spurious change
* removed unecessary conditional from ensure_valid_username and added support for auth.info.name in user_params_from_auth
* minor changes
2022-03-09 12:07:35 +01:00
8e04ac45be
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Not a real conflict, just upstream getting rid of unused constants too close
to glitch-soc-specific contents.
Removed unused constants like upstream did.
- `app/models/trends.rb`:
Conflict because glitch-soc disabled email notifications for trending links.
Upstream has refactored this quite a bit and added trending posts.
Took upstream code, but disabling the extra trending stuff will come in
another commit.
- `app/views/admin/trends/links/index.html.haml`:
Conflict due to glitch-soc's theming system.
Ported upstream changes accordingly.
2022-02-26 09:29:23 +01:00
e64561e4ae
Bump aws-sdk-s3 from 1.112.0 to 1.113.0 ( #17642 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.112.0 to 1.113.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-25 01:48:46 +01:00
ddf6fa684b
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-19 11:33:18 +01:00
823d816c06
Bump pundit from 2.1.1 to 2.2.0 ( #17543 )
...
* Bump pundit from 2.1.1 to 2.2.0
Bumps [pundit](https://github.com/varvet/pundit ) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/varvet/pundit/releases )
- [Changelog](https://github.com/varvet/pundit/blob/main/CHANGELOG.md )
- [Commits](https://github.com/varvet/pundit/compare/v2.1.1...v2.2.0 )
---
updated-dependencies:
- dependency-name: pundit
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* `include Pundit` is deprecated
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-19 13:30:06 +09:00
175446f293
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Conflict due to glitch-soc adding the `content_type` column on status edits
and thus having a different schema version number.
Solved by taking upstream's schema version number, as it is higher than
glitch-soc's.
2022-02-17 10:58:44 +01:00
349e244fb8
Bump scenic from 1.5.5 to 1.6.0 ( #17547 )
...
Bumps [scenic](https://github.com/scenic-views/scenic ) from 1.5.5 to 1.6.0.
- [Release notes](https://github.com/scenic-views/scenic/releases )
- [Changelog](https://github.com/scenic-views/scenic/blob/main/CHANGELOG.md )
- [Commits](https://github.com/scenic-views/scenic/compare/v1.5.5...v1.6.0 )
---
updated-dependencies:
- dependency-name: scenic
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 19:18:09 +09:00
47c24cf2eb
Revert "Bump strong_migrations from 0.7.9 to 0.8.0 ( #17504 )" ( #17540 )
...
This reverts commit 6b996fca0f
2022-02-14 16:08:23 +01:00
64cdb83d94
Bump kt-paperclip from 7.0.1 to 7.1.1 ( #17502 )
...
Bumps [kt-paperclip](https://github.com/kreeti/kt-paperclip ) from 7.0.1 to 7.1.1.
- [Release notes](https://github.com/kreeti/kt-paperclip/releases )
- [Changelog](https://github.com/kreeti/kt-paperclip/blob/master/NEWS )
- [Commits](https://github.com/kreeti/kt-paperclip/compare/v7.0.1...v7.1.1 )
---
updated-dependencies:
- dependency-name: kt-paperclip
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 20:21:09 +09:00
6b996fca0f
Bump strong_migrations from 0.7.9 to 0.8.0 ( #17504 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.9 to 0.8.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.9...v0.8.0 )
---
updated-dependencies:
- dependency-name: strong_migrations
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 08:05:22 +09:00
bb445a991f
Bump annotate from 3.1.1 to 3.2.0 ( #17503 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ctran/annotate_models/compare/v3.1.1...v3.2.0 )
---
updated-dependencies:
- dependency-name: annotate
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 08:04:32 +09:00
90097e55a0
Bump rspec-rails from 5.0.2 to 5.1.0 ( #17406 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.0.2 to 5.1.0.
- [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.0 )
---
updated-dependencies:
- dependency-name: rspec-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 08:00:26 +09:00
b7882a75d2
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Upstream moved things around in a place where glitch-soc had support for
an extra parameter (`content_type`).
Follow upstream but reintroduce `content_type`.
2022-02-10 19:09:27 +01:00
8bfbe14288
Bump fabrication from 2.24.0 to 2.27.0 ( #17447 )
...
Bumps [fabrication](https://gitlab.com/fabrication-gem/fabrication ) from 2.24.0 to 2.27.0.
- [Release notes](https://gitlab.com/fabrication-gem/fabrication/tags )
- [Changelog](https://gitlab.com/fabrication-gem/fabrication/blob/master/Changelog.markdown )
- [Commits](https://gitlab.com/fabrication-gem/fabrication/compare/2.24.0...2.27.0 )
---
updated-dependencies:
- dependency-name: fabrication
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:25:42 +01:00
06882c8097
Bump aws-sdk-s3 from 1.111.3 to 1.112.0 ( #17452 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.111.3 to 1.112.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:12:09 +01:00
0296013d2e
Bump bootsnap from 1.10.2 to 1.10.3 ( #17466 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.10.2...v1.10.3 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:11:41 +01:00
9a270fd54a
Bump puma from 5.5.2 to 5.6.1 ( #17411 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.5.2 to 5.6.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.5.2...v5.6.1 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 15:09:06 +01:00
bab90c9e1b
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-08 18:23:53 +01:00
a44cc7931a
Remove language detection through cld3 ( #17478 )
...
* Remove language detection through cld3
* Update app/helpers/languages_helper.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-08 02:41:17 +01:00
daab277c0e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Upstream-updated lib textually too close to glitch-soc-only dep.
Updated like upstream.
2022-01-28 08:58:32 +01:00
5801e6d7ef
Bump pg from 1.2.3 to 1.3.0 ( #17349 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.2.3 to 1.3.0.
- [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.2.3...v1.3.0 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-27 20:26:40 +09:00
b7de46786d
Bump rdf-normalize from 0.4.0 to 0.5.0 ( #17226 )
...
Bumps [rdf-normalize](https://github.com/ruby-rdf/rdf-normalize ) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/ruby-rdf/rdf-normalize/releases )
- [Commits](https://github.com/ruby-rdf/rdf-normalize/compare/0.4.0...0.5.0 )
---
updated-dependencies:
- dependency-name: rdf-normalize
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-27 20:25:18 +09:00
56a49e9334
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream changed a header but we had different default headers.
Applied the same change, and also dropped HSTS headers redundant with
Rails'.
2022-01-26 22:32:21 +01:00
cb80dc6c35
Bump json-ld-preloaded from 3.1.6 to 3.2.0 ( #17353 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.1.6 to 3.2.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.6...3.2.0 )
---
updated-dependencies:
- dependency-name: json-ld-preloaded
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 21:23:42 +09:00
e2e7aad5e8
Bump fabrication from 2.23.1 to 2.24.0 ( #17356 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.23.1 to 2.24.0.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/commits )
---
updated-dependencies:
- dependency-name: fabrication
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 21:22:51 +09:00
5a3db0d7b9
Bump sidekiq from 6.3.1 to 6.4.0 ( #17350 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.3.1 to 6.4.0.
- [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.3.1...v6.4.0 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 21:22:10 +09:00
67ce5d774c
Bump cld3 from 3.4.3 to 3.4.4 ( #17357 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.4.3 to 3.4.4.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.4.3...v3.4.4 )
---
updated-dependencies:
- dependency-name: cld3
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:48:05 +09:00
e23ac7533c
Bump bootsnap from 1.10.1 to 1.10.2 ( #17367 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.10.1...v1.10.2 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:45:45 +09:00
2a3e637e56
Bump rubocop from 1.24.1 to 1.25.0 ( #17322 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.24.1 to 1.25.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.24.1...v1.25.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 20:39:08 +09:00
d36eb0503f
Please CodeClimate
2022-01-24 21:29:50 +01:00
5c88cb1a67
Add optional hCaptcha support
...
Fixes #1649
This requires setting `HCAPTCHA_SECRET_KEY` and `HCAPTCHA_SITE_KEY`, then
enabling the admin setting at
`/admin/settings/edit#form_admin_settings_captcha_enabled`
Subsequently, a hCaptcha widget will be displayed on `/about` and
`/auth/sign_up` unless:
- the user is already signed-up already
- the user has used an invite link
- the user has already solved the captcha (and registration failed for another
reason)
The Content-Security-Policy headers are altered automatically to allow the
third-party hCaptcha scripts on `/about` and `/auth/sign_up` following the same
rules as above.
2022-01-24 21:22:13 +01:00
ad5fd97277
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-19 12:32:44 +01:00
14a82cadc5
Bump thor from 1.1.0 to 1.2.1 ( #17250 )
...
Bumps [thor](https://github.com/rails/thor ) from 1.1.0 to 1.2.1.
- [Release notes](https://github.com/rails/thor/releases )
- [Commits](https://github.com/rails/thor/compare/v1.1.0...v1.2.1 )
---
updated-dependencies:
- dependency-name: thor
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:07:37 +09:00
98ab5025d7
Bump nokogiri from 1.12.5 to 1.13.1 ( #17306 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.12.5 to 1.13.1.
- [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.12.5...v1.13.1 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:06:17 +09:00
2e46fca321
Bump aws-sdk-s3 from 1.109.0 to 1.111.1 ( #17277 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.109.0 to 1.111.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:04:34 +09:00
85d321a874
Bump ed25519 from 1.2.4 to 1.3.0 ( #17310 )
...
Bumps [ed25519](https://github.com/RubyCrypto/ed25519 ) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/RubyCrypto/ed25519/releases )
- [Changelog](https://github.com/RubyCrypto/ed25519/blob/main/CHANGES.md )
- [Commits](https://github.com/RubyCrypto/ed25519/compare/v1.2.4...v1.3.0 )
---
updated-dependencies:
- dependency-name: ed25519
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:04:11 +09:00
e6eb819c82
Bump bootsnap from 1.9.3 to 1.10.1 ( #17311 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.9.3 to 1.10.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.9.3...v1.10.1 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 11:03:28 +09:00
338c47b6c6
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-07 19:51:47 +01:00
d0aa0b45db
Bump rspec_junit_formatter from 0.4.1 to 0.5.0 ( #17249 )
...
Bumps [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter ) from 0.4.1 to 0.5.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.4.1...v0.5.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:35:42 +09:00
b600bd5c83
Bump rubocop from 1.23.0 to 1.24.1 ( #17228 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.23.0 to 1.24.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.23.0...v1.24.1 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 10:26:53 +09:00
b4ef2d8d11
Bump rubocop-rails from 2.12.4 to 2.13.0 ( #17195 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.12.4 to 2.13.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.12.4...v2.13.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-06 09:51:46 +09:00
2136aa2759
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
We have completely different contents. Kept our version.
- `package.json`:
Not a real conflict, just an upstream dependency udpated
textually too close to a glitch-soc-only dependency.
Updated dependencies like upstream.
- `streaming/index.js`:
Conflict due to code style changes on parts that were
modified in glitch-soc to handle local-only toots.
Changed style according to upstream.
2021-12-27 15:16:18 +01:00
d817592dfc
Bump bullet from 6.1.5 to 7.0.0 ( #17154 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.5 to 7.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/6.1.5...7.0.0 )
---
updated-dependencies:
- dependency-name: bullet
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>
2021-12-21 10:58:59 +09:00
9e8b240958
Bump fabrication from 2.22.0 to 2.23.1 ( #17160 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.22.0 to 2.23.1.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/commits )
---
updated-dependencies:
- dependency-name: fabrication
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:37:42 +09:00
52bd83e4e7
Bump brakeman from 5.1.2 to 5.2.0 ( #17158 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.1.2...v5.2.0 )
---
updated-dependencies:
- dependency-name: brakeman
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:37:25 +09:00
db5b4c800c
Bump aws-sdk-s3 from 1.107.0 to 1.109.0 ( #17101 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.107.0 to 1.109.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-21 09:19:29 +09:00
efeabec5eb
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-30 12:13:54 +01:00
dependabot[bot]