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,128 workflow run results
2,128 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge in latest l10n strings No unresolved conflicts #3913: Commit 715ae42 pushed by mozilla-pontoon
June 23, 2024 00:06 17s main
main
June 23, 2024 00:06 17s
MPP-3827: Move user creation methods to privaterelay.tests.utils No unresolved conflicts #3911: Pull request #4802 opened by jwhitlock
June 21, 2024 20:55 11s move-user-creation-methods-mpp-4763
move-user-creation-methods-mpp-4763
June 21, 2024 20:55 11s
MPP-3827 - Prefer user.profile to Profile.objects.get(user=user) No unresolved conflicts #3910: Pull request #4798 synchronize by jwhitlock
June 21, 2024 20:34 17s user-profile-mpp-4763
user-profile-mpp-4763
June 21, 2024 20:34 17s
MPP-3827 - Prefer user.profile to Profile.objects.get(user=user) No unresolved conflicts #3909: Pull request #4798 synchronize by jwhitlock
June 21, 2024 20:26 16s user-profile-mpp-4763
user-profile-mpp-4763
June 21, 2024 20:26 16s
MPP-3827 - Prefer user.profile to Profile.objects.get(user=user) No unresolved conflicts #3908: Pull request #4798 synchronize by jwhitlock
June 21, 2024 16:04 23s user-profile-mpp-4763
user-profile-mpp-4763
June 21, 2024 16:04 23s
Update to django-csp 4.0 No unresolved conflicts #3907: Pull request #4800 synchronize by jwhitlock
June 21, 2024 15:52 17s django-csp-4.0
django-csp-4.0
June 21, 2024 15:52 17s
Merge pull request #4801 from mozilla/api-client-mpp-3827 No unresolved conflicts #3906: Commit 2268044 pushed by github-merge-queue bot
June 21, 2024 14:06 12s main
main
June 21, 2024 14:06 12s
Merge pull request #4799 from mozilla/split-exceptions-validators-mpp… No unresolved conflicts #3905: Commit ba2d78a pushed by github-merge-queue bot
June 21, 2024 14:02 13s main
main
June 21, 2024 14:02 13s
MPP-3827: Switch from RequestsClient to APIClient, remove transaction tests No unresolved conflicts #3904: Pull request #4801 opened by jwhitlock
June 20, 2024 23:06 17s api-client-mpp-3827
api-client-mpp-3827
June 20, 2024 23:06 17s
Update to django-csp 4.0 No unresolved conflicts #3903: Pull request #4800 synchronize by jwhitlock
June 20, 2024 21:42 11s django-csp-4.0
django-csp-4.0
June 20, 2024 21:42 11s
Update to django-csp 4.0 No unresolved conflicts #3902: Pull request #4800 opened by jwhitlock
June 20, 2024 20:34 16s django-csp-4.0
django-csp-4.0
June 20, 2024 20:34 16s
MPP-3827: Move non-model code out of emails/models.py No unresolved conflicts #3901: Pull request #4799 opened by jwhitlock
June 20, 2024 19:26 18s split-exceptions-validators-mpp-3827
split-exceptions-validators-mpp-3827
June 20, 2024 19:26 18s
MPP-2822: add gtag to Layout and update gaEvent hook to ping both GA endpoints No unresolved conflicts #3900: Pull request #4796 synchronize by groovecoder
June 20, 2024 18:45 16s simple-ga4
simple-ga4
June 20, 2024 18:45 16s
MPP-2822: add gtag to Layout and update gaEvent hook to ping both GA endpoints No unresolved conflicts #3899: Pull request #4796 synchronize by groovecoder
June 20, 2024 16:37 16s simple-ga4
simple-ga4
June 20, 2024 16:37 16s
Merge pull request #4721 from mozilla/clean-users-with-blank-emails-m… No unresolved conflicts #3898: Commit 5cbdedf pushed by github-merge-queue bot
June 20, 2024 15:53 13s main
main
June 20, 2024 15:53 13s
MPP-3827 - Prefer user.profile to Profile.objects.get(user=user) No unresolved conflicts #3897: Pull request #4798 opened by jwhitlock
June 20, 2024 15:42 19s user-profile-mpp-4763
user-profile-mpp-4763
June 20, 2024 15:42 19s
Merge pull request #4797 from mozilla/fix-auth-page-selectors No unresolved conflicts #3896: Commit 83b3df7 pushed by github-merge-queue bot
June 20, 2024 15:30 13s main
main
June 20, 2024 15:30 13s
Fix FxA selectors for e2e tests No unresolved conflicts #3895: Pull request #4797 opened by rafeerahman
June 20, 2024 15:08 19s fix-auth-page-selectors
fix-auth-page-selectors
June 20, 2024 15:08 19s
MPP-3439: Refactor DataIssueTask / CleanerTask, clean users with blank emails No unresolved conflicts #3894: Pull request #4721 synchronize by jwhitlock
June 19, 2024 16:02 17s clean-users-with-blank-emails-mpp-3439
clean-users-with-blank-emails-mpp-3439
June 19, 2024 16:02 17s
Merge in latest l10n strings No unresolved conflicts #3893: Commit 62b511e pushed by mozilla-pontoon
June 19, 2024 00:06 14s main
main
June 19, 2024 00:06 14s
Merge pull request #4788 from mozilla/dependabot/npm_and_yarn/next-14… No unresolved conflicts #3892: Commit d57e215 pushed by github-merge-queue bot
June 18, 2024 21:18 16s main
main
June 18, 2024 21:18 16s
MPP-2822: add gtag to Layout and update gaEvent hook to ping both GA endpoints No unresolved conflicts #3891: Pull request #4796 synchronize by groovecoder
June 18, 2024 16:56 12s simple-ga4
simple-ga4
June 18, 2024 16:56 12s
MPP-2822: add gtag to Layout and update gaEvent hook to ping both GA endpoints No unresolved conflicts #3890: Pull request #4796 opened by groovecoder
June 18, 2024 16:54 13s simple-ga4
simple-ga4
June 18, 2024 16:54 13s
Merge pull request #4795 from mozilla/dependabot/npm_and_yarn/ws-8.17.1 No unresolved conflicts #3889: Commit 764090c pushed by github-merge-queue bot
June 18, 2024 15:34 13s main
main
June 18, 2024 15:34 13s
Bump ws from 8.12.0 to 8.17.1 No unresolved conflicts #3888: Pull request #4795 opened by dependabot bot
June 18, 2024 04:16 16s dependabot/npm_and_yarn/ws-8.17.1
dependabot/npm_and_yarn/ws-8.17.1
June 18, 2024 04:16 16s