Skip to content

Actions: mozilla/fx-private-relay

Actions

No unresolved conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,577 workflow runs
3,577 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #5293 from mozilla/dependabot/pip/mypy-1.14.1 No unresolved conflicts #5169: Commit 3c5fd7a pushed by github-merge-queue bot
January 7, 2025 23:09 12s main
main
January 7, 2025 23:09 12s
Merge pull request #5297 from mozilla/dependabot/npm_and_yarn/sass-1.… No unresolved conflicts #5168: Commit ec25b6c pushed by github-merge-queue bot
January 7, 2025 22:51 12s main
main
January 7, 2025 22:51 12s
Merge pull request #5295 from mozilla/dependabot/npm_and_yarn/react-i… No unresolved conflicts #5167: Commit c1643bf pushed by github-merge-queue bot
January 7, 2025 22:50 12s main
main
January 7, 2025 22:50 12s
Bump mypy from 1.14.0 to 1.14.1 No unresolved conflicts #5166: Pull request #5293 synchronize by dependabot bot
January 7, 2025 22:49 12s dependabot/pip/mypy-1.14.1
dependabot/pip/mypy-1.14.1
January 7, 2025 22:49 12s
Merge pull request #5294 from mozilla/dependabot/pip/ruff-0.8.6 No unresolved conflicts #5165: Commit 93ae225 pushed by github-merge-queue bot
January 7, 2025 22:48 19s main
main
January 7, 2025 22:48 19s
Merge pull request #5292 from mozilla/dependabot/pip/boto-2832a8b788 No unresolved conflicts #5164: Commit 368c523 pushed by github-merge-queue bot
January 7, 2025 22:48 11s main
main
January 7, 2025 22:48 11s
Bump sass from 1.83.0 to 1.83.1 No unresolved conflicts #5163: Pull request #5297 opened by dependabot bot
January 6, 2025 01:34 9s dependabot/npm_and_yarn/sass-1.83.1
dependabot/npm_and_yarn/sass-1.83.1
January 6, 2025 01:34 9s
Bump typescript from 5.4.5 to 5.7.2 No unresolved conflicts #5162: Pull request #5296 opened by dependabot bot
January 6, 2025 01:34 11s dependabot/npm_and_yarn/typescript-5.7.2
dependabot/npm_and_yarn/typescript-5.7.2
January 6, 2025 01:34 11s
Bump the react group across 1 directory with 4 updates No unresolved conflicts #5161: Pull request #5274 synchronize by dependabot bot
January 6, 2025 01:33 11s dependabot/npm_and_yarn/react-e6f670ff25
dependabot/npm_and_yarn/react-e6f670ff25
January 6, 2025 01:33 11s
Bump react-intersection-observer from 9.14.0 to 9.14.1 No unresolved conflicts #5160: Pull request #5295 opened by dependabot bot
January 6, 2025 01:33 16s dependabot/npm_and_yarn/react-intersection-observer-9.14.1
dependabot/npm_and_yarn/react-intersection-observer-9.14.1
January 6, 2025 01:33 16s
Bump ruff from 0.8.4 to 0.8.6 No unresolved conflicts #5159: Pull request #5294 opened by dependabot bot
January 6, 2025 01:11 12s dependabot/pip/ruff-0.8.6
dependabot/pip/ruff-0.8.6
January 6, 2025 01:11 12s
Bump mypy from 1.14.0 to 1.14.1 No unresolved conflicts #5158: Pull request #5293 opened by dependabot bot
January 6, 2025 01:11 10s dependabot/pip/mypy-1.14.1
dependabot/pip/mypy-1.14.1
January 6, 2025 01:11 10s
Bump the boto group with 5 updates No unresolved conflicts #5157: Pull request #5292 opened by dependabot bot
January 6, 2025 01:10 14s dependabot/pip/boto-2832a8b788
dependabot/pip/boto-2832a8b788
January 6, 2025 01:10 14s
Merge pull request #5281 from mozilla/dependabot/pip/mypy-1.14.0 No unresolved conflicts #5156: Commit 20e275d pushed by github-merge-queue bot
December 31, 2024 13:55 11s main
main
December 31, 2024 13:55 11s
Bump mypy from 1.13.0 to 1.14.0 No unresolved conflicts #5155: Pull request #5281 synchronize by groovecoder
December 31, 2024 13:31 12s dependabot/pip/mypy-1.14.0
dependabot/pip/mypy-1.14.0
December 31, 2024 13:31 12s
Bump the react group across 1 directory with 4 updates No unresolved conflicts #5154: Pull request #5274 synchronize by dependabot bot
December 31, 2024 12:21 14s dependabot/npm_and_yarn/react-e6f670ff25
dependabot/npm_and_yarn/react-e6f670ff25
December 31, 2024 12:21 14s
Merge pull request #5277 from mozilla/dependabot/npm_and_yarn/react-t… No unresolved conflicts #5153: Commit 34e99ae pushed by github-merge-queue bot
December 31, 2024 12:19 13s main
main
December 31, 2024 12:19 13s
Bump react-toastify from 10.0.6 to 11.0.2 No unresolved conflicts #5152: Pull request #5277 synchronize by dependabot bot
December 31, 2024 11:36 12s dependabot/npm_and_yarn/react-toastify-11.0.2
dependabot/npm_and_yarn/react-toastify-11.0.2
December 31, 2024 11:36 12s
Merge pull request #5257 from mozilla/frontend-fix-types No unresolved conflicts #5151: Commit b394293 pushed by github-merge-queue bot
December 31, 2024 02:45 15s main
main
December 31, 2024 02:45 15s
Merge pull request #5271 from mozilla/npm-typescript-nanoid No unresolved conflicts #5150: Commit 2e8e12c pushed by github-merge-queue bot
December 30, 2024 19:09 12s main
main
December 30, 2024 19:09 12s
Merge pull request #5285 from mozilla/dependabot/pip/django-allauth-s… No unresolved conflicts #5149: Commit 2626fc4 pushed by github-merge-queue bot
December 30, 2024 19:05 10s main
main
December 30, 2024 19:05 10s
Bump the react group across 1 directory with 4 updates No unresolved conflicts #5148: Pull request #5274 synchronize by dependabot bot
December 30, 2024 17:49 15s dependabot/npm_and_yarn/react-e6f670ff25
dependabot/npm_and_yarn/react-e6f670ff25
December 30, 2024 17:49 15s
Merge pull request #5289 from mozilla/dependabot/npm_and_yarn/nextjs-… No unresolved conflicts #5147: Commit 70db212 pushed by github-merge-queue bot
December 30, 2024 17:47 11s main
main
December 30, 2024 17:47 11s
Bump django-allauth[socialaccount] from 65.3.0 to 65.3.1 No unresolved conflicts #5146: Pull request #5285 synchronize by dependabot bot
December 30, 2024 17:38 15s dependabot/pip/django-allauth-socialaccount--65.3.1
dependabot/pip/django-allauth-socialaccount--65.3.1
December 30, 2024 17:38 15s
Bump mypy from 1.13.0 to 1.14.0 No unresolved conflicts #5145: Pull request #5281 synchronize by groovecoder
December 30, 2024 17:18 15s dependabot/pip/mypy-1.14.0
dependabot/pip/mypy-1.14.0
December 30, 2024 17:18 15s