Skip to content

Actions: DSpace/RestContract

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

label_merge_conflicts.yml
50 workflow runs
50 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Merge pull request #259 from DSpace/tdonohue-csrf-doc-updates Check for merge conflicts #50: Commit b3d5eec pushed by tdonohue
May 16, 2024 15:28 16s main
main
May 16, 2024 15:28 16s
Merge pull request #268 from DSpace/backport-260-to-dspace-7_x Check for merge conflicts #49: Commit c8303c3 pushed by tdonohue
May 9, 2024 21:48 13s dspace-7_x
dspace-7_x
May 9, 2024 21:48 13s
Merge pull request #260 from atmire/fixed-collection-put-content-body Check for merge conflicts #48: Commit 00b1c1f pushed by tdonohue
May 9, 2024 21:48 16s main
main
May 9, 2024 21:48 16s
Merge pull request #267 from DSpace/backport-266-to-dspace-7_x Check for merge conflicts #47: Commit c50f7aa pushed by tdonohue
May 8, 2024 14:15 10s dspace-7_x
dspace-7_x
May 8, 2024 14:15 10s
Merge pull request #266 from ybnd/remove-unsupported-ACO-patch-info Check for merge conflicts #46: Commit e7c4d22 pushed by tdonohue
May 8, 2024 14:14 18s main
main
May 8, 2024 14:14 18s
Merge pull request #264 from DSpace/backport-256-to-dspace-7_x Check for merge conflicts #45: Commit dda4d78 pushed by tdonohue
May 3, 2024 21:19 23s dspace-7_x
dspace-7_x
May 3, 2024 21:19 23s
Merge pull request #256 from uniba-ub/restcontract-issue255 Check for merge conflicts #44: Commit 972a1b9 pushed by tdonohue
May 3, 2024 21:17 33s main
main
May 3, 2024 21:17 33s
Merge pull request #263 from DSpace/backport-261-to-dspace-7_x Check for merge conflicts #43: Commit 22eeef9 pushed by tdonohue
May 3, 2024 20:53 2m 10s dspace-7_x
dspace-7_x
May 3, 2024 20:53 2m 10s
Merge pull request #261 from saschaszott/patch-2 Check for merge conflicts #42: Commit d34e1bd pushed by tdonohue
May 3, 2024 20:41 18s main
main
May 3, 2024 20:41 18s
New /api/security/csrf endpoint & updated CSRF docs Check for merge conflicts #41: Pull request #259 synchronize by tdonohue
March 28, 2024 14:57 31s
March 28, 2024 14:57 31s
Merge pull request #258 from DSpace/backport-257-to-dspace-7_x Check for merge conflicts #40: Commit 0da109d pushed by tdonohue
March 11, 2024 14:54 10s dspace-7_x
dspace-7_x
March 11, 2024 14:54 10s
Merge pull request #257 from alanorth/fix-link Check for merge conflicts #39: Commit 84ab116 pushed by tdonohue
March 11, 2024 14:54 18s main
main
March 11, 2024 14:54 18s
Merge pull request #251 from 4Science/coar-notify-7-part-two Check for merge conflicts #38: Commit 02764cb pushed by tdonohue
March 4, 2024 22:32 25s main
main
March 4, 2024 22:32 25s
Merge pull request #252 from the-library-code/DSpace_duplicate_contract Check for merge conflicts #37: Commit 7b39dc0 pushed by tdonohue
March 4, 2024 15:29 22s main
main
March 4, 2024 15:29 22s
Coar Notify Integration - Administer/Log Check for merge conflicts #36: Pull request #251 synchronize by frabacche
March 4, 2024 08:05 17s
March 4, 2024 08:05 17s
Duplicate Detection: REST Contract submission section & item link Check for merge conflicts #35: Pull request #252 synchronize by kshepherd
March 3, 2024 22:59 15s
March 3, 2024 22:59 15s
Merge pull request #249 from 4Science/coar-notify-7 Check for merge conflicts #34: Commit 84e09b2 pushed by tdonohue
February 29, 2024 20:22 16s main
main
February 29, 2024 20:22 16s
Duplicate Detection: REST Contract submission section & item link Check for merge conflicts #33: Pull request #252 synchronize by kshepherd
February 28, 2024 21:26 18s
February 28, 2024 21:26 18s
Duplicate Detection: REST Contract submission section & item link Check for merge conflicts #32: Pull request #252 synchronize by kshepherd
February 28, 2024 21:21 17s
February 28, 2024 21:21 17s
Merge pull request #202 from jeffmorin/main Check for merge conflicts #31: Commit 1ed2768 pushed by tdonohue
February 28, 2024 17:52 39s main
main
February 28, 2024 17:52 39s
Duplicate Detection: REST Contract submission section & item link Check for merge conflicts #30: Pull request #252 synchronize by kshepherd
February 28, 2024 01:21 15s
February 28, 2024 01:21 15s
[DS-4301] Added Content Reports section and Filtered Collections report therein Check for merge conflicts #29: Pull request #202 synchronize by jeffmorin
February 27, 2024 21:40 18s
February 27, 2024 21:40 18s
Merge pull request #250 from 4Science/CST-12107_cdl_request_withdrawal Check for merge conflicts #28: Commit 73df0d4 pushed by tdonohue
February 27, 2024 21:10 18s main
main
February 27, 2024 21:10 18s
[DS-4301] Added Content Reports section and Filtered Collections report therein Check for merge conflicts #27: Pull request #202 synchronize by jeffmorin
February 27, 2024 01:13 16s
February 27, 2024 01:13 16s
[DS-4301] Added Content Reports section and Filtered Collections report therein Check for merge conflicts #26: Pull request #202 synchronize by jeffmorin
February 22, 2024 21:20 17s
February 22, 2024 21:20 17s