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
2,308 workflow runs
2,308 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump ng-mocks from 14.13.1 to 14.13.2 in the testing group Check for merge conflicts #3911: Pull request #3836 synchronize by dependabot bot
January 17, 2025 22:55 33m 50s
January 17, 2025 22:55 33m 50s
Bump webpack from 5.96.1 to 5.97.1 in the webpack group Check for merge conflicts #3910: Pull request #3833 synchronize by dependabot bot
January 17, 2025 22:54 30m 6s
January 17, 2025 22:54 30m 6s
Merge pull request #3839 from DSpace/dependabot/npm_and_yarn/dspace-8… Check for merge conflicts #3909: Commit 9e2699c pushed by tdonohue
January 17, 2025 22:49 27m 16s dspace-8_x
dspace-8_x
January 17, 2025 22:49 27m 16s
Merge pull request #3830 from DSpace/dependabot/npm_and_yarn/dspace-7… Check for merge conflicts #3908: Commit f3df3cc pushed by tdonohue
January 17, 2025 22:29 43m 21s dspace-7_x
dspace-7_x
January 17, 2025 22:29 43m 21s
Merge pull request #3831 from DSpace/dependabot/npm_and_yarn/dspace-7… Check for merge conflicts #3907: Commit 8ef5317 pushed by tdonohue
January 17, 2025 18:04 2m 45s dspace-7_x
dspace-7_x
January 17, 2025 18:04 2m 45s
Merge pull request #3838 from DSpace/dependabot/npm_and_yarn/dspace-8… Check for merge conflicts #3906: Commit c0ed0da pushed by tdonohue
January 17, 2025 18:03 12s dspace-8_x
dspace-8_x
January 17, 2025 18:03 12s
Merge pull request #3834 from DSpace/dependabot/npm_and_yarn/types/lo… Check for merge conflicts #3905: Commit 7009cf3 pushed by tdonohue
January 17, 2025 18:02 46s main
main
January 17, 2025 18:02 46s
Bump ng-mocks from 14.13.1 to 14.13.2 in the testing group Check for merge conflicts #3904: Pull request #3836 synchronize by dependabot bot
January 17, 2025 17:27 21m 23s
January 17, 2025 17:27 21m 23s
Merge pull request #3835 from DSpace/dependabot/npm_and_yarn/isbot-5.… Check for merge conflicts #3903: Commit cd29596 pushed by tdonohue
January 17, 2025 17:21 24s main
main
January 17, 2025 17:21 24s
Merge pull request #3848 from DSpace/backport-3845-to-dspace-8_x Check for merge conflicts #3902: Commit 6ca8ac5 pushed by tdonohue
January 17, 2025 17:13 18s dspace-8_x
dspace-8_x
January 17, 2025 17:13 18s
Prevent request with page size of 9999 Check for merge conflicts #3901: Pull request #3694 synchronize by FrancescoMolinaro
January 17, 2025 16:42 4m 9s
January 17, 2025 16:42 4m 9s
Merge pull request #3752 from DSpace/dependabot/npm_and_yarn/nanoid-3… Check for merge conflicts #3900: Commit 3c47acf pushed by tdonohue
January 17, 2025 16:42 26s main
main
January 17, 2025 16:42 26s
Merge pull request #3832 from DSpace/dependabot/npm_and_yarn/testing-… Check for merge conflicts #3899: Commit 570d711 pushed by tdonohue
January 17, 2025 16:40 30s main
main
January 17, 2025 16:40 30s
Merge pull request #3828 from DSpace/dependabot/npm_and_yarn/dspace-7… Check for merge conflicts #3898: Commit 395a5b2 pushed by tdonohue
January 17, 2025 16:40 22s dspace-7_x
dspace-7_x
January 17, 2025 16:40 22s
Merge pull request #3845 from atmire/issue-3840-scoped-browse-bys Check for merge conflicts #3897: Commit b2a10e4 pushed by tdonohue
January 17, 2025 15:11 31s main
main
January 17, 2025 15:11 31s
Upgrade to Bootstrap 5 & realign themes Check for merge conflicts #3896: Pull request #3506 synchronize by Wout-atmire
January 17, 2025 13:47 16s
January 17, 2025 13:47 16s
Restrict Angular SSR to paths in the sitemap Check for merge conflicts #3895: Pull request #3682 synchronize by alanorth
January 17, 2025 12:31 16s
January 17, 2025 12:31 16s
Bump webpack from 5.96.1 to 5.97.1 in the webpack group Check for merge conflicts #3894: Pull request #3833 synchronize by dependabot bot
January 16, 2025 00:13 1h 7m 47s
January 16, 2025 00:13 1h 7m 47s
Bump isbot from 5.1.17 to 5.1.21 Check for merge conflicts #3893: Pull request #3831 synchronize by dependabot bot
January 15, 2025 23:48 1h 23m 36s
January 15, 2025 23:48 1h 23m 36s
Bump sanitize-html from 2.13.1 to 2.14.0 Check for merge conflicts #3892: Pull request #3830 synchronize by dependabot bot
January 15, 2025 23:46 1h 19m 42s
January 15, 2025 23:46 1h 19m 42s
Bump core-js from 3.39.0 to 3.40.0 Check for merge conflicts #3891: Pull request #3837 synchronize by dependabot bot
January 15, 2025 23:46 1h 9m 36s
January 15, 2025 23:46 1h 9m 36s
Bump @types/lodash from 4.17.13 to 4.17.14 Check for merge conflicts #3890: Pull request #3838 synchronize by dependabot bot
January 15, 2025 23:44 1h 5m 14s
January 15, 2025 23:44 1h 5m 14s
Bump the testing group across 1 directory with 2 updates Check for merge conflicts #3889: Pull request #3828 synchronize by dependabot bot
January 15, 2025 22:54 1h 49m 39s
January 15, 2025 22:54 1h 49m 39s
Merge pull request #3774 from DSpace/dependabot/npm_and_yarn/dspace-7… Check for merge conflicts #3888: Commit 75e45d4 pushed by tdonohue
January 15, 2025 22:47 1h 51m 25s dspace-7_x
dspace-7_x
January 15, 2025 22:47 1h 51m 25s
Merge pull request #3780 from DSpace/dependabot/npm_and_yarn/dspace-8… Check for merge conflicts #3887: Commit 64baa6e pushed by tdonohue
January 15, 2025 22:46 1h 48m 35s dspace-8_x
dspace-8_x
January 15, 2025 22:46 1h 48m 35s