Skip to content

Actions: uniba-ub/DSpace

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
112 workflow runs
112 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #10089 from toniprieto/reduce-memory-oai Check for merge conflicts #117: Commit f6ce766 pushed by floriangantner
December 25, 2024 16:24 3s main
main
December 25, 2024 16:24 3s
Merged in task/dspace-cris-2023_02_x/DSC-2092 (pull request #3247) Check for merge conflicts #116: Commit 66b1f96 pushed by floriangantner
December 25, 2024 16:23 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 25, 2024 16:23 2s
Merge pull request #10080 from tdonohue/support_other_docker_repos Check for merge conflicts #115: Commit 4bc9e72 pushed by floriangantner
December 16, 2024 08:14 2s main
main
December 16, 2024 08:14 2s
Merged in task/dspace-cris-2023_02_x/DSC-1897 (pull request #2663) Check for merge conflicts #114: Commit 731e0d9 pushed by floriangantner
December 16, 2024 08:13 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 16, 2024 08:13 3s
Merge pull request #9318 from leuphana/issue-9317 Check for merge conflicts #113: Commit be92570 pushed by floriangantner
December 11, 2024 13:02 4s main
main
December 11, 2024 13:02 4s
Merge pull request #9728 from atmire/w2p-116609_improve-running-proce… Check for merge conflicts #112: Commit 1b16a55 pushed by floriangantner
December 9, 2024 09:12 3s main
main
December 9, 2024 09:12 3s
Merged in task/dspace-cris-2023_02_x/ORC-20 (pull request #3115) Check for merge conflicts #111: Commit f014452 pushed by floriangantner
December 9, 2024 09:11 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 9, 2024 09:11 3s
Merge pull request #10070 from tdonohue/fixup_docker_builds Check for merge conflicts #110: Commit b88b237 pushed by floriangantner
December 4, 2024 16:29 3s main
main
December 4, 2024 16:29 3s
Merge pull request #10051 from saschaszott/saschaszott-patch-3 Check for merge conflicts #109: Commit c90e993 pushed by floriangantner
December 2, 2024 15:27 4s main
main
December 2, 2024 15:27 4s
Fix syntax error in #10040. Env variables cannot have dashes or periods Check for merge conflicts #108: Commit fc544a8 pushed by floriangantner
November 27, 2024 08:42 3s main
main
November 27, 2024 08:42 3s
Merge pull request #10022 from DSpace/dependabot/maven/org.apache.htt… Check for merge conflicts #107: Commit ce32f68 pushed by floriangantner
November 19, 2024 17:03 3s main
main
November 19, 2024 17:03 3s
Merged in task/dspace-cris-2023_02_x/DSC-1883-AddStartDateTime (pull … Check for merge conflicts #106: Commit 6636fe9 pushed by floriangantner
November 19, 2024 16:01 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
November 19, 2024 16:01 3s
Prepare addon version for the next development iteration Check for merge conflicts #105: Commit 45392fb pushed by floriangantner
November 8, 2024 08:48 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
November 8, 2024 08:48 3s
Merge pull request #9952 from DSpace/dependabot/maven/build-tools-6d7… Check for merge conflicts #104: Commit b034b07 pushed by floriangantner
November 6, 2024 09:47 3s main
main
November 6, 2024 09:47 3s
Merge pull request #9947 from saschaszott/patch-52 Check for merge conflicts #103: Commit d230e22 pushed by floriangantner
November 4, 2024 16:01 2s main
main
November 4, 2024 16:01 2s
Merge pull request #9931 from DSpace/dependabot/maven/fasterxml-15c11… Check for merge conflicts #102: Commit 75edf36 pushed by floriangantner
October 31, 2024 07:18 2s main
main
October 31, 2024 07:18 2s
Exclude spring from build-tools group in dependabot.yml Check for merge conflicts #101: Commit efdd351 pushed by floriangantner
October 30, 2024 10:14 2s main
main
October 30, 2024 10:14 2s
Merged in task/dspace-cris-2023_02_x/DSC-2001 (pull request #2963) Check for merge conflicts #100: Commit e2792be pushed by floriangantner
October 30, 2024 10:13 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 30, 2024 10:13 2s
Merged in task/dspace-cris-2023_02_x/DSC-1766_csrf_fix (pull request … Check for merge conflicts #99: Commit 0163d5c pushed by floriangantner
October 28, 2024 10:43 4s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 28, 2024 10:43 4s
Merge pull request #9907 from DSpace/dependabot/maven/maven-056b5b5b47 Check for merge conflicts #98: Commit 6725681 pushed by floriangantner
October 24, 2024 14:22 2s main
main
October 24, 2024 14:22 2s
[DSC-1827] Update dspace version Check for merge conflicts #97: Commit 5bf6c6e pushed by floriangantner
October 24, 2024 14:21 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 24, 2024 14:21 3s
Merge pull request #9894 from kshepherd/gitignore-factorypath Check for merge conflicts #96: Commit 3f4949a pushed by floriangantner
October 21, 2024 11:41 2s main
main
October 21, 2024 11:41 2s
Merged in task/dspace-cris_2023_02_x/DSC-1968_DSC-1969_DSC-1970 (pull… Check for merge conflicts #95: Commit 27cbcd4 pushed by floriangantner
October 21, 2024 11:38 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 21, 2024 11:38 3s
Merged in task/dspace-cris-2023_02_x/DSC-1960 (pull request #2864) Check for merge conflicts #94: Commit ca92e14 pushed by floriangantner
October 15, 2024 08:30 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 15, 2024 08:30 2s
Merge pull request #9885 from tdonohue/update_latest_spring6 Check for merge conflicts #93: Commit 1e5cb64 pushed by floriangantner
October 14, 2024 12:30 5s main
main
October 14, 2024 12:30 5s