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

chore(deps): bump trix from 2.1.0 to 2.1.1 in the npm_and_yarn group across 1 directory #2749

Merged
merged 1 commit into from
May 7, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github May 7, 2024

Bumps the npm_and_yarn group with 1 update in the / directory: trix.

Updates trix from 2.1.0 to 2.1.1

Release notes

Sourced from trix's releases.

v2.1.1

What's Changed

New Contributors

Full Changelog: basecamp/trix@v2.1.0...v2.1.1

Commits
  • 0c79bcb v2.1.1
  • 1a5c68a Merge pull request #1149 from basecamp/paste-html-sanitize
  • 14bac18 Sanitize HTML content in data-trix-* attributes
  • 1abe3d2 Test attachment content is sanitized
  • 841ff19 Merge pull request #1147 from basecamp/sanitize-noscript
  • 5e03f4a Sanitize noscript to prevent copy and paste XSS
  • 36c7aeb Merge pull request #1146 from basecamp/dependabot/npm_and_yarn/tar-6.2.1
  • c6023ed Bump tar from 6.2.0 to 6.2.1
  • See full diff 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 show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions
    You can disable automated security fix PRs for this repo from the Security Alerts page.

Bumps the npm_and_yarn group with 1 update in the / directory: [trix](https://github.com/basecamp/trix).


Updates `trix` from 2.1.0 to 2.1.1
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](basecamp/trix@v2.1.0...v2.1.1)

---
updated-dependencies:
- dependency-name: trix
  dependency-type: direct:production
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file Javascript Pull requests that update Javascript code labels May 7, 2024
Copy link

codeclimate bot commented May 7, 2024

Code Climate has analyzed commit 60b442d and detected 0 issues on this pull request.

View more on Code Climate.

@Paul-Bob Paul-Bob merged commit 2d653ca into main May 7, 2024
19 of 21 checks passed
@Paul-Bob Paul-Bob deleted the dependabot/npm_and_yarn/npm_and_yarn-d386b4a441 branch May 7, 2024 17:32
Copy link
Contributor

github-actions bot commented May 7, 2024

This PR has been merged into main. The functionality will be available in the next release.

Please check the release guide for more information.

@Paul-Bob Paul-Bob added the Chore label May 8, 2024
gabrielgiroe1 pushed a commit that referenced this pull request May 8, 2024
…2749)

Bumps the npm_and_yarn group with 1 update in the / directory: [trix](https://github.com/basecamp/trix).


Updates `trix` from 2.1.0 to 2.1.1
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](basecamp/trix@v2.1.0...v2.1.1)

---
updated-dependencies:
- dependency-name: trix
  dependency-type: direct:production
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Paul-Bob added a commit that referenced this pull request Aug 5, 2024
* Add support for alternative IDs using Hashids

* Fix rubocop

* Remove Hashid inclusion from ApplicationRecord

* Add  Hashid inclusion

* Fix error for hashid

* Fix lint error

* Add hashid-rails on development test

* Add require statement for hashid-rails gem in application.rb

* Remove unnecessary require statement for 'hashid/rails' in application.rb

* Update gemfile

* Resolve conflict
git reset

* Add gemfiles

* appraisal bundle

* Replace direct record id expouser with safer alternative

* Fix lint

* Revert to record.id

* Fix selector in tabs_spec

* Fix selector in has_many

* Fix selector

* Fix selector

* Fix selector

* Fix value for id

* wip

* Fix enum_array_display_value_false_spec

* possible quick fix for not showing belongs to

* Fix has_many_field_spec

* Fix fields_methods_for_views_spec

* fix: check proper dir for internal controller override (#2712)

* feature: configurable default pagination (#2717)

* feature: configurable default pagination

* add on template

* revert countless config

* feature: linkable association titles (#2591)

* fix: eager load actions (#2719)

* fix: actions eager loader (#2726)

* fix: render background context when accessing extrernal action links (#2730)

* fix: actions links POC

* wip

* TODO

* wip

* wip

* correct frame id

* lint

* lint

* fix: don't export `avo.custom.js` build (#2731)

* Bumped avo to 3.6.2

* fix: cache_table_rows (#2733)

* Bumped avo to 3.6.3

* fix: table cache (#2734)

* fiix: table cache

* revert

* Bumped avo to 3.6.4

* fix: resource controls spacing issue (#2740)

* fix: check if ActionText::RichText is defined (#2741)

* Bumped avo to 3.7.0

* chore(deps): bump trix in the npm_and_yarn group across 1 directory (#2749)

Bumps the npm_and_yarn group with 1 update in the / directory: [trix](https://github.com/basecamp/trix).


Updates `trix` from 2.1.0 to 2.1.1
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](basecamp/trix@v2.1.0...v2.1.1)

---
updated-dependencies:
- dependency-name: trix
  dependency-type: direct:production
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: require ostruct (#2750)

* [js] Update all Yarn dependencies (2024-04-25) (#2720)

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Paul Bob <69730720+Paul-Bob@users.noreply.github.com>
Co-authored-by: Adrian Marin <adrian@adrianthedev.com>

* wip

* feature: heading target (#2753)

* Update Gemfile

* Resolve conflict
git reset

* Update Gemfile

* Removed duplication

* Removed duplication

* wip

* wip

* wip

* tweaks for #2564 (#2776)

* tweaks

* .

* lint

* .

* test

* tweak

* revert tests on special branch

* wip

* wip

* wip

* wip

* wip

* Update lib/avo/fields/belongs_to_field.rb

* .

* belongs to field tweaks

* lint

* bundle

* fix belongs_to

* force lock

* bundle

* try --full-index

* appraisal update rubocop

* rm --full-index

* add record_param

* fix target_resource

* tweaks

* wip

* fix target_resource

* ransack cleanup

* dont include hashids for rails 8

* attach issue message

* fix belongs to selects

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Paul Bob <paul.ionut.bob@gmail.com>
Co-authored-by: Paul Bob <69730720+Paul-Bob@users.noreply.github.com>
Co-authored-by: Adrian Marin <adrian@adrianthedev.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Chore dependencies Pull requests that update a dependency file Javascript Pull requests that update Javascript code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant