Skip to content

Actions: DSpace/dspace-angular

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
1,857 workflow run results
1,857 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #3565 from DSpace/dependabot/npm_and_yarn/dspace-7… Check for merge conflicts #3467: Commit 6a7c19a pushed by tdonohue
October 25, 2024 18:59 24s dspace-7_x
dspace-7_x
October 25, 2024 18:59 24s
Merge pull request #3561 from DSpace/dependabot/npm_and_yarn/dspace-7… Check for merge conflicts #3466: Commit fc9eb11 pushed by tdonohue
October 25, 2024 18:50 23s dspace-7_x
dspace-7_x
October 25, 2024 18:50 23s
Bump the angular group with 3 updates Check for merge conflicts #3465: Pull request #3560 synchronize by dependabot bot
October 25, 2024 18:00 11m 6s
October 25, 2024 18:00 11m 6s
Bump sass from 1.80.3 to 1.80.4 in the sass group Check for merge conflicts #3464: Pull request #3569 synchronize by dependabot bot
October 25, 2024 17:58 18s
October 25, 2024 17:58 18s
Ensure "axe-*" is a member of the "testing" group, as it's only used … Check for merge conflicts #3463: Commit 497f4fd pushed by tdonohue
October 25, 2024 17:57 21s main
main
October 25, 2024 17:57 21s
[Port dspace-8_x] Remove unused dependencies (& additional Mirador dependency cleanup) Check for merge conflicts #3462: Pull request #3573 synchronize by tdonohue
October 25, 2024 17:44 17s
October 25, 2024 17:44 17s
[Port dspace-7_x] Remove unused dependencies (& additional Mirador dependency cleanup) Check for merge conflicts #3461: Pull request #3574 synchronize by tdonohue
October 25, 2024 17:41 16s
October 25, 2024 17:41 16s
[Port dspace-7_x] Remove unused dependencies (& additional Mirador dependency cleanup) Check for merge conflicts #3460: Pull request #3574 synchronize by tdonohue
October 25, 2024 17:29 17s
October 25, 2024 17:29 17s
Upgrade to Bootstrap 5 & realign themes Check for merge conflicts #3459: Pull request #3506 synchronize by Wout-atmire
October 25, 2024 14:58 19s
October 25, 2024 14:58 19s
Merge pull request #3553 from tdonohue/remove_unused_deps Check for merge conflicts #3458: Commit 43630bb pushed by kshepherd
October 24, 2024 20:07 35s main
main
October 24, 2024 20:07 35s
Remove unused dependencies Check for merge conflicts #3457: Pull request #3553 synchronize by tdonohue
October 24, 2024 17:35 15s
October 24, 2024 17:35 15s
Merge pull request #3551 from tdonohue/update_http-proxy-middleware_8x Check for merge conflicts #3456: Commit 22e911c pushed by tdonohue
October 24, 2024 16:21 18s dspace-8_x
dspace-8_x
October 24, 2024 16:21 18s
Merge pull request #3548 from tdonohue/remove_unused_postcss_deps_8x Check for merge conflicts #3455: Commit 882d09a pushed by kshepherd
October 24, 2024 14:06 21s dspace-8_x
dspace-8_x
October 24, 2024 14:06 21s
Merge pull request #3550 from tdonohue/update_http-proxy-middleware Check for merge conflicts #3454: Commit b4231dc pushed by kshepherd
October 24, 2024 14:04 30s main
main
October 24, 2024 14:04 30s
Merge pull request #3555 from DSpace/backport-3524-to-dspace-8_x Check for merge conflicts #3453: Commit 9905693 pushed by kshepherd
October 24, 2024 13:28 19s dspace-8_x
dspace-8_x
October 24, 2024 13:28 19s
Merge pull request #3554 from DSpace/backport-3524-to-dspace-7_x Check for merge conflicts #3452: Commit ef11340 pushed by kshepherd
October 24, 2024 13:28 20s dspace-7_x
dspace-7_x
October 24, 2024 13:28 20s
Merge pull request #3547 from tdonohue/remove_unused_postcss_deps Check for merge conflicts #3451: Commit 660b873 pushed by kshepherd
October 24, 2024 12:30 38s main
main
October 24, 2024 12:30 38s
Merge pull request #3524 from Andrea-Guevara/AligningTheWordBrowse Check for merge conflicts #3450: Commit 9c4e8a3 pushed by kshepherd
October 24, 2024 11:45 31s main
main
October 24, 2024 11:45 31s
[#2718] Migrate cookie consent from Klaro to Orejime Check for merge conflicts #3449: Pull request #3199 synchronize by AndreaBarbasso
October 24, 2024 08:47 20s
October 24, 2024 08:47 20s
Merge pull request #3552 from tdonohue/update_http-proxy-middleware_7x Check for merge conflicts #3448: Commit 40e805f pushed by alanorth
October 24, 2024 05:44 20s dspace-7_x
dspace-7_x
October 24, 2024 05:44 20s
Merge pull request #3549 from tdonohue/remove_unused_postcss_deps_7x Check for merge conflicts #3447: Commit a719a23 pushed by alanorth
October 24, 2024 05:41 20s dspace-7_x
dspace-7_x
October 24, 2024 05:41 20s
[Port dspace-8_x] Bump http-proxy-middleware from 1.0.5 to 2.0.7 Check for merge conflicts #3446: Pull request #3551 synchronize by tdonohue
October 23, 2024 20:09 17s
October 23, 2024 20:09 17s
[Port dspace-7_x] Bump http-proxy-middleware from 1.0.5 to 2.0.7 Check for merge conflicts #3445: Pull request #3552 synchronize by tdonohue
October 23, 2024 20:05 15s
October 23, 2024 20:05 15s
Merge pull request #3545 from DSpace/backport-3481-to-dspace-7_x Check for merge conflicts #3444: Commit 3deef34 pushed by tdonohue
October 23, 2024 19:33 22s dspace-7_x
dspace-7_x
October 23, 2024 19:33 22s
Merge pull request #3544 from tdonohue/remove_types_sanitize_html Check for merge conflicts #3443: Commit bd43d95 pushed by tdonohue
October 23, 2024 18:16 32s main
main
October 23, 2024 18:16 32s