Skip to content

Actions: mozilla/fx-private-relay

Actions

No unresolved conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,450 workflow run results
2,450 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge in latest l10n strings No unresolved conflicts #4235: Commit e4d0086 pushed by mozilla-pontoon
August 3, 2024 00:06 11s main
main
August 3, 2024 00:06 11s
MPP-3079: Add a C4 Relay model, initial diagrams No unresolved conflicts #4234: Pull request #4901 synchronize by jwhitlock
August 2, 2024 19:28 12s add-c4-model-mpp-3079
add-c4-model-mpp-3079
August 2, 2024 19:28 12s
MPP-3079: Add a C4 Relay model, initial diagrams No unresolved conflicts #4233: Pull request #4901 synchronize by jwhitlock
August 2, 2024 18:19 12s add-c4-model-mpp-3079
add-c4-model-mpp-3079
August 2, 2024 18:19 12s
Merge pull request #4917 from mozilla/update-rel-eng-to-base-load-eng… No unresolved conflicts #4232: Commit e8f15b2 pushed by github-merge-queue bot
July 31, 2024 19:08 12s main
main
July 31, 2024 19:08 12s
change release engineer to base load engineer No unresolved conflicts #4231: Pull request #4917 synchronize by groovecoder
July 31, 2024 16:19 15s update-rel-eng-to-base-load-eng-mpp-3853
update-rel-eng-to-base-load-eng-mpp-3853
July 31, 2024 16:19 15s
change release engineer to base load engineer No unresolved conflicts #4230: Pull request #4917 synchronize by groovecoder
July 31, 2024 16:08 14s update-rel-eng-to-base-load-eng-mpp-3853
update-rel-eng-to-base-load-eng-mpp-3853
July 31, 2024 16:08 14s
Merge pull request #4913 from mozilla/dependabot/pip/typing-stubs-dc5… No unresolved conflicts #4229: Commit 1cf5082 pushed by github-merge-queue bot
July 31, 2024 15:55 12s main
main
July 31, 2024 15:55 12s
change release engineer to base load engineer No unresolved conflicts #4228: Pull request #4917 synchronize by groovecoder
July 31, 2024 15:28 14s update-rel-eng-to-base-load-eng-mpp-3853
update-rel-eng-to-base-load-eng-mpp-3853
July 31, 2024 15:28 14s
Bump the typing-stubs group with 2 updates No unresolved conflicts #4227: Pull request #4913 synchronize by groovecoder
July 31, 2024 15:24 11s dependabot/pip/typing-stubs-dc58c16c12
dependabot/pip/typing-stubs-dc58c16c12
July 31, 2024 15:24 11s
Merge pull request #4911 from mozilla/dependabot/npm_and_yarn/react-a… No unresolved conflicts #4226: Commit 3ac620b pushed by github-merge-queue bot
July 31, 2024 14:21 2m 43s main
main
July 31, 2024 14:21 2m 43s
Bump the typing-stubs group with 2 updates No unresolved conflicts #4225: Pull request #4913 synchronize by groovecoder
July 31, 2024 13:56 13s dependabot/pip/typing-stubs-dc58c16c12
dependabot/pip/typing-stubs-dc58c16c12
July 31, 2024 13:56 13s
Bump react-aria from 3.33.1 to 3.34.1 No unresolved conflicts #4224: Pull request #4911 synchronize by Vinnl
July 31, 2024 11:26 11s dependabot/npm_and_yarn/react-aria-3.34.1
dependabot/npm_and_yarn/react-aria-3.34.1
July 31, 2024 11:26 11s
Merge pull request #4915 from mozilla/dependabot/pip/glean-parser-14.3.0 No unresolved conflicts #4223: Commit 993ef81 pushed by github-merge-queue bot
July 30, 2024 19:14 14s main
main
July 30, 2024 19:14 14s
Merge pull request #4916 from mozilla/dependabot/pip/sentry-sdk-2.11.0 No unresolved conflicts #4222: Commit 2aa4747 pushed by github-merge-queue bot
July 30, 2024 19:10 12s main
main
July 30, 2024 19:10 12s
Merge pull request #4914 from mozilla/dependabot/pip/ruff-0.5.5 No unresolved conflicts #4221: Commit fe19b01 pushed by github-merge-queue bot
July 30, 2024 19:10 12s main
main
July 30, 2024 19:10 12s
Bump the typing-stubs group with 2 updates No unresolved conflicts #4220: Pull request #4913 synchronize by dependabot bot
July 30, 2024 16:12 14s dependabot/pip/typing-stubs-dc58c16c12
dependabot/pip/typing-stubs-dc58c16c12
July 30, 2024 16:12 14s
Bump ruff from 0.5.4 to 0.5.5 No unresolved conflicts #4219: Pull request #4914 synchronize by dependabot bot
July 30, 2024 16:12 15s dependabot/pip/ruff-0.5.5
dependabot/pip/ruff-0.5.5
July 30, 2024 16:12 15s
Merge pull request #4912 from mozilla/dependabot/pip/boto-ad1b63ebba No unresolved conflicts #4218: Commit fd61e5f pushed by github-merge-queue bot
July 30, 2024 16:10 11s main
main
July 30, 2024 16:10 11s
Bump react-aria from 3.33.1 to 3.34.1 No unresolved conflicts #4217: Pull request #4911 synchronize by dependabot bot
July 30, 2024 15:56 10s dependabot/npm_and_yarn/react-aria-3.34.1
dependabot/npm_and_yarn/react-aria-3.34.1
July 30, 2024 15:56 10s
Bump react-aria from 3.33.1 to 3.34.1 No unresolved conflicts #4216: Pull request #4911 synchronize by dependabot bot
July 30, 2024 15:55 10s dependabot/npm_and_yarn/react-aria-3.34.1
dependabot/npm_and_yarn/react-aria-3.34.1
July 30, 2024 15:55 10s
Merge pull request #4910 from mozilla/dependabot/npm_and_yarn/react-s… No unresolved conflicts #4215: Commit 1529e17 pushed by github-merge-queue bot
July 30, 2024 15:54 14s main
main
July 30, 2024 15:54 14s
Bump react-aria from 3.33.1 to 3.34.1 No unresolved conflicts #4214: Pull request #4911 synchronize by dependabot bot
July 30, 2024 15:37 11s dependabot/npm_and_yarn/react-aria-3.34.1
dependabot/npm_and_yarn/react-aria-3.34.1
July 30, 2024 15:37 11s
Merge pull request #4909 from mozilla/dependabot/npm_and_yarn/playwri… No unresolved conflicts #4213: Commit 303f7d2 pushed by github-merge-queue bot
July 30, 2024 15:35 18s main
main
July 30, 2024 15:35 18s
Bump react-stately from 3.31.1 to 3.32.1 No unresolved conflicts #4212: Pull request #4910 synchronize by groovecoder
July 30, 2024 15:33 10s dependabot/npm_and_yarn/react-stately-3.32.1
dependabot/npm_and_yarn/react-stately-3.32.1
July 30, 2024 15:33 10s
Merge pull request #4905 from mozilla/dependabot/npm_and_yarn/testing… No unresolved conflicts #4211: Commit 4a7738c pushed by github-merge-queue bot
July 30, 2024 15:25 11s main
main
July 30, 2024 15:25 11s