Skip to content

Actions: 4Science/DSpace

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
578 workflow runs
578 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #9938 from DSpace/dependabot/maven/spring-2aedf272b2 Check for merge conflicts #1168: Commit a354d6e pushed by 4science-it
October 30, 2024 19:11 2s main
main
October 30, 2024 19:11 2s
Merge pull request #9939 from DSpace/dependabot/maven/solr.client.ver… Check for merge conflicts #1167: Commit 74b2d51 pushed by 4science-it
October 30, 2024 18:41 3s main
main
October 30, 2024 18:41 3s
Merge pull request #9940 from DSpace/dependabot/maven/build-tools-9d8… Check for merge conflicts #1166: Commit ce6b584 pushed by 4science-it
October 30, 2024 16:01 3s main
main
October 30, 2024 16:01 3s
Merge pull request #9929 from DSpace/dependabot/maven/test-tools-cb46… Check for merge conflicts #1165: Commit 9afe7d6 pushed by 4science-it
October 30, 2024 15:41 3s main
main
October 30, 2024 15:41 3s
Exclude spring from build-tools group in dependabot.yml Check for merge conflicts #1164: Commit efdd351 pushed by 4science-it
October 29, 2024 20:11 3s main
main
October 29, 2024 20:11 3s
Merge pull request #9926 from DSpace/tdonohue-dependabot Check for merge conflicts #1163: Commit 3dbc8ec pushed by 4science-it
October 29, 2024 19:51 2s main
main
October 29, 2024 19:51 2s
Merged in task/dspace-cris-2023_02_x/DSC-2001 (pull request #2963) Check for merge conflicts #1162: Commit e2792be pushed by 4science-it
October 29, 2024 17:59 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 29, 2024 17:59 2s
[DSC-1998] Add crisfund.award.uri to registry Check for merge conflicts #1161: Commit c7ac3ee pushed by 4science-it
October 28, 2024 15:24 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 28, 2024 15:24 2s
Merged in task/dspace-cris-2023_02_x/DSC-1766_csrf_fix (pull request … Check for merge conflicts #1160: Commit 0163d5c pushed by 4science-it
October 25, 2024 16:44 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 25, 2024 16:44 2s
skip indexing of metadatavalue with security level Check for merge conflicts #1159: Pull request #453 synchronize by floriangantner
October 24, 2024 15:52 3s
October 24, 2024 15:52 3s
[DSC-1827] Update dspace version Check for merge conflicts #1158: Commit 5bf6c6e pushed by 4science-it
October 23, 2024 16:40 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 23, 2024 16:40 3s
Merge pull request #9907 from DSpace/dependabot/maven/maven-056b5b5b47 Check for merge conflicts #1157: Commit 6725681 pushed by 4science-it
October 23, 2024 15:52 3s main
main
October 23, 2024 15:52 3s
Merged in task/dspace-cris_2023_02_x/DSC-1968_DSC-1969_DSC-1970 (pull… Check for merge conflicts #1156: Commit 27cbcd4 pushed by 4science-it
October 16, 2024 19:04 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 16, 2024 19:04 3s
Merged in task/dspace-cris-2023_02_x/DSC-1958_fix (pull request #2873) Check for merge conflicts #1155: Commit 4425985 pushed by 4science-it
October 16, 2024 17:54 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 16, 2024 17:54 2s
Merge pull request #9894 from kshepherd/gitignore-factorypath Check for merge conflicts #1154: Commit 3f4949a pushed by 4science-it
October 16, 2024 15:31 3s main
main
October 16, 2024 15:31 3s
Merged in task/dspace-cris-2023_02_x/DSC-1963 (pull request #2868) Check for merge conflicts #1153: Commit 5780e79 pushed by 4science-it
October 16, 2024 09:34 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 16, 2024 09:34 2s
Merged in task/dspace-cris-2023_02_x/DSC-1960 (pull request #2864) Check for merge conflicts #1152: Commit ca92e14 pushed by 4science-it
October 14, 2024 13:25 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 14, 2024 13:25 3s
Merge pull request #9885 from tdonohue/update_latest_spring6 Check for merge conflicts #1151: Commit 1e5cb64 pushed by 4science-it
October 11, 2024 19:11 4s main
main
October 11, 2024 19:11 4s
Merged in task/dspace-cris-2023_02_x/DSC-1949 (pull request #2826) Check for merge conflicts #1150: Commit f21e6f5 pushed by 4science-it
October 11, 2024 12:24 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 11, 2024 12:24 2s
Merged in task/dspace-cris-2023_02_x/DSC-1827 (pull request #2834) Check for merge conflicts #1149: Commit 978726f pushed by 4science-it
October 11, 2024 09:34 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 11, 2024 09:34 3s
Merge pull request #9777 from saschaszott/patch-47 Check for merge conflicts #1148: Commit 048663a pushed by 4science-it
October 8, 2024 19:21 3s main
main
October 8, 2024 19:21 3s
Merged in task/dspace-cris-2023_02_x/DSC-1487 (pull request #2683) Check for merge conflicts #1147: Commit 1041d97 pushed by 4science-it
October 4, 2024 14:29 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 4, 2024 14:29 3s
Merged in task/dspace-cris-2023_02_x/DSC-1662 (pull request #2635) Check for merge conflicts #1146: Commit 96d33a9 pushed by 4science-it
October 4, 2024 07:19 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 4, 2024 07:19 2s
Merged in task/dspace-cris-2023_02_x/DSC-1739 (pull request #2675) Check for merge conflicts #1145: Commit 85f0e68 pushed by 4science-it
October 2, 2024 14:49 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 2, 2024 14:49 3s
Merged in task/dspace-cris-2023_02_x/DSC-1869 (pull request #2667) Check for merge conflicts #1144: Commit 9b57b6d pushed by 4science-it
October 2, 2024 14:44 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
October 2, 2024 14:44 2s