Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump doorkeeper from 5.6.0 to 5.6.5 #1970

Open
wants to merge 24 commits into
base: handon-production
Choose a base branch
from

Conversation

dependabot[bot]
Copy link

@dependabot dependabot bot commented on behalf of github Feb 27, 2023

Bumps doorkeeper from 5.6.0 to 5.6.5.

Release notes

Sourced from doorkeeper's releases.

v5.6.5

  • #1602 Allow custom data to be stored inside access grants/tokens.
  • #1634 Code refactoring for custom token attributes.
  • #1639 Add grant type validation to avoid Internal Server Error for DELETE /oauth/authorize endpoint.

v5.6.4

  • #1633 Apply ORM configuration in #to_prepare block to avoid autoloading errors.

v5.6.3

  • #1622 Drop support for Rubies 2.5 and 2.6
  • #1605 Fix URI validation for Ruby 3.2+.
  • #1625 Exclude endless access tokens from StaleRecordsCleaner.
  • #1626 Remove deprecated active_record_options config option.
  • #1631 Fix regression with redirect behavior after token lookup optimizations (redirect to app URI when found).
  • #1630 Special case unique index creation for refresh_token on SQL Server.
  • #1627 Lazy evaluate Doorkeeper config when loading files and executing initializers.

v5.6.2

  • #1604 Fix fetching of the application when custom application_class defined.

v5.6.1

  • #1593 Add support for Trilogy ActiveRecord adapter.
  • #1597 Add optional support to use the url path for the native authorization code flow. Ports forward #1143 from 4.4.3
  • #1599 Remove unnecessarily re-fetch of application object when creating an access token.
Changelog

Sourced from doorkeeper's changelog.

5.6.5

  • #1602 Allow custom data to be stored inside access grants/tokens.
  • #1634 Code refactoring for custom token attributes.
  • #1639 Add grant type validation to avoid Internal Server Error for DELETE /oauth/authorize endpoint.

5.6.4

  • #1633 Apply ORM configuration in #to_prepare block to avoid autoloading errors.

5.6.3

  • #1622 Drop support for Rubies 2.5 and 2.6
  • #1605 Fix URI validation for Ruby 3.2+.
  • #1625 Exclude endless access tokens from StaleRecordsCleaner.
  • #1626 Remove deprecated active_record_options config option.
  • #1631 Fix regression with redirect behavior after token lookup optimizations (redirect to app URI when found).
  • #1630 Special case unique index creation for refresh_token on SQL Server.
  • #1627 Lazy evaluate Doorkeeper config when loading files and executing initializers.

5.6.2

  • #1604 Fix fetching of the application when custom application_class defined.

5.6.1

  • #1593 Add support for Trilogy ActiveRecord adapter.
  • #1597 Add optional support to use the url path for the native authorization code flow. Ports forward #1143 from 4.4.3
  • #1599 Remove unnecessarily re-fetch of application object when creating an access token.
Commits
  • dcce720 Release 5.6.5 🎉
  • a90d4c1 Merge pull request #1639 from doorkeeper-gem/fix-auth-destroy
  • a2a39f9 Add grant type vlaidation to avoid Internal Server Error for DELETE /oauth/au...
  • 0dcb083 [ci skip] Fix CHANGELOG
  • 1e8c8cf Merge pull request #1634 from doorkeeper-gem/code-refactoring
  • a897741 Refactor custom token attributes & some other code
  • 8436928 Merge pull request #1602 from teamsimplepay/pre_auth_extension
  • e4ae754 Implementing feedback changes
  • b580c18 Added config option to permit and return custom fields in access tokens
  • 3ad48e0 Release 5.6.4 🎉
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

highemerly and others added 24 commits November 17, 2022 23:42
- 検索クエリを分かち書きを行わない言語に最適化
- 形態素解析を行うためにElasticsearch側にkuromojiを導入
- 検索結果をマッチ度順ではなく日付順に変更

Conflicts:
	app/chewy/statuses_index.rb
- 投票作成時,その選択肢の数の上限を4から16に変更
- 投票作成時,その有効期限をより細かく設定出来るように変更
- Announcement機能をマージ(lindwurm/mastodon)

Conflicts:
	app/javascript/mastodon/components/status.js
[Fix] InstanceTickerを有効にしても自インスタンスではティッカーを表示しない設定を通知欄にも適用

- InstanceTickerを有効にするテーマの場合,はんドンクラブのティッカーは非表示にしていた
- これまでは適用範囲がHTL/FTL/LTLのみだったが,今回それに加えてnotificationも追加した

[Change] InstanceTickerのURL変更に対応

InstanceTicker/InstanceTicker#11
- ユニークユーザ5人以上で選出されるものを3人以上で選出されるよう変更

Conflicts:
	app/models/trending_tags.rb
- カスタム絵文字としてユーザのアイコンが使える機能
- 対象はトゥート,投票の選択肢,お知らせ,アカウントプロフィール欄
- 自サーバの人が他サーバのアカウントのプロフィール絵文字を使うことはできる
- 他サーバの人がプロフィール絵文字を使うことはできない
- 3.3.0からHTL上にDMを表示するようになった
- きもちわるいので3.2.x以前の表示に戻すオプションをつくり,かつそれを初期値に設定した

Conflicts:
	config/locales/simple_form.en.yml

Conflicts:
	config/locales/simple_form.ja.yml

Conflicts:
	app/lib/feed_manager.rb
	app/services/fan_out_on_write_service.rb

Conflicts:
	app/models/user.rb
	config/locales/simple_form.en.yml

Conflicts:
	config/locales/simple_form.ja.yml
Conflicts:
	app/models/media_attachment.rb
- BlackLeadを追加
- CantaDarkを追加
- Mastodonオリジナルのスタイルを復活
Conflicts:
	config/locales/simple_form.en.yml

Conflicts:
	config/locales/simple_form.ja.yml

Conflicts:
	app/javascript/styles/mastodon/accounts.scss
	config/i18n-tasks.yml
- 上級者モードが無効で、かつPC表示の場合に、上部ナビバーのレイアウト崩れが発生していた問題を修正
- 上級者モードが無効で、かつPC表示の場合に、右部ナビバーの投稿ボタンの文言がダミー文字列となっていた問題を修正
- 「Handon」テーマのライトモードにおいて、TL上での公開範囲を表すアイコン色が見づらくなっていたため、色を変更
- 「Handon」テーマのBlackLeadにおいて、通知欄のレイアウト崩れが発生していた問題を修正
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.6.0 to 5.6.5.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md)
- [Commits](doorkeeper-gem/doorkeeper@v5.6.0...v5.6.5)

---
updated-dependencies:
- dependency-name: doorkeeper
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file ruby Pull requests that update Ruby code labels Feb 27, 2023
@github-actions
Copy link

github-actions bot commented Apr 5, 2023

This pull request has merge conflicts that must be resolved before it can be merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file rebase needed 🚧 ruby Pull requests that update Ruby code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant