Skip to content

chore: fix merge conflicts into develop #449

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.

Sign up for GitHub

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

Merged
scottmries merged 8 commits into from
Jun 2, 2025
Merged

chore: fix merge conflicts into develop #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bde02c6
chore: RC v4.10.2
attest-team-ci Nov 5, 2024
2cca230
chore: RC v4.10.2 (#424)
nayanrajDQ Nov 5, 2024
c09a72f
Release 4.10.2 (#426)
michael-siek Nov 8, 2024
a5ec13e
chore: merge master into release (#439)
scottmries Apr 11, 2025
19d4810
chore: RC v4.10.3 (#444)
github-actions[bot] Apr 14, 2025
9974275
Merge branch 'master' into release
scottmries Apr 14, 2025
c74dd5c
chore: Release 4.10.3 (#446)
scottmries Apr 15, 2025
5d0bda7
chore: merge master into develop
scottmries Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ defaults: &defaults
resource_class: large

orbs:
browser-tools: circleci/browser-tools@1.5.2
node: circleci/node@5.0.0
browser-tools: circleci/browser-tools@1.5.3
node: circleci/node@5.0.3

commands:
bootstrap:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.

## [4.10.2](https://github.com/dequelabs/axe-core-gems/compare/v4.10.1...v4.10.2) (2024-11-05)

## [4.10.3](https://github.com/dequelabs/axe-core-gems/compare/v4.10.1...v4.10.3) (2025-04-11)
Copy link

@coderabbitai coderabbitai bot Jun 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix comparison link to previous version

The comparison link currently spans from v4.10.1 to v4.10.3. It should start from v4.10.2 to accurately reflect the diff between the last released version and this one.

- ## [4.10.3](https://github.com/dequelabs/axe-core-gems/compare/v4.10.1...v4.10.3) (2025-04-11)
+ ## [4.10.3](https://github.com/dequelabs/axe-core-gems/compare/v4.10.2...v4.10.3) (2025-04-11)
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
## [4.10.3](https://github.com/dequelabs/axe-core-gems/compare/v4.10.1...v4.10.3) (2025-04-11)
## [4.10.3](https://github.com/dequelabs/axe-core-gems/compare/v4.10.2...v4.10.3) (2025-04-11)
🤖 Prompt for AI Agents 
In CHANGELOG.md at line 5, the version comparison link incorrectly starts from
v4.10.1 instead of v4.10.2. Update the link to compare from v4.10.2 to v4.10.3
to accurately reflect the changes from the last released version to the current
one.


### Bug Fixes

* Update axe-core to v4.10.1 ([#412](https://github.com/dequelabs/axe-core-gems/issues/412)) ([53569f6](https://github.com/dequelabs/axe-core-gems/commit/53569f6914d1086eeedfee65128ed1611aab4254))
* Update axe-core to v4.10.2 ([#419](https://github.com/dequelabs/axe-core-gems/issues/419)) ([7e72b19](https://github.com/dequelabs/axe-core-gems/commit/7e72b194f5b4810fb4ac0622f8711f1a7dafcedb))
* Update axe-core to v4.10.3 ([#433](https://github.com/dequelabs/axe-core-gems/issues/433)) ([29253e3](https://github.com/dequelabs/axe-core-gems/commit/29253e39fd5489b290bab981caf74ed6fc0a6972))

## [4.10.1](https://github.com/dequelabs/axe-core-gems/compare/v4.10.0...v4.10.1) (2024-10-07)

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "axe-core-gems",
"version": "4.10.2",
"version": "4.10.3",
"license": "MPL-2.0",
"private": true,
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# this version is used by all the packages

module AxeCoreGems
VERSION = "4.10.2"
VERSION = "4.10.3"
end
Loading