fd0c34e13f
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
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>
2 years ago
2b414f4d73
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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.
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
301299d036
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
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>
2 years ago
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
2 years ago
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.
2 years ago
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>
2 years ago
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>
2 years ago
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.
2 years ago
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>
2 years ago
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>
2 years ago
3b4abfe132
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
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>
2 years ago
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>
2 years ago
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.
2 years ago
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>
2 years ago
eada1864ef
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
f4cab3ebad
Change search indexing to use batches to minimize resource usage ( #18451 )
3 years ago
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>
3 years ago
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>
3 years ago
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.
3 years ago
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>
3 years ago
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>
3 years ago
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.
3 years ago
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>
3 years ago
6f69b831d6
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
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`
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
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.
3 years ago
0069bebafe
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
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.
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
bdaf4179b3
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire
dependabot[bot]
Eugen Rochko