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
568 workflow runs
568 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #9955 from DSpace/dependabot/maven/jetty.version-9… Check for merge conflicts #1183: Commit f6ce54c pushed by 4science-it
November 8, 2024 21:01 2s main
main
November 8, 2024 21:01 2s
Merge pull request #9958 from DSpace/dependabot/maven/com.nimbusds-ni… Check for merge conflicts #1182: Commit 20b103a pushed by 4science-it
November 8, 2024 20:31 2s main
main
November 8, 2024 20:31 2s
Merge pull request #9953 from DSpace/dependabot/maven/spring-60cca81614 Check for merge conflicts #1181: Commit cc74bf1 pushed by 4science-it
November 8, 2024 17:21 3s main
main
November 8, 2024 17:21 3s
Merge pull request #9960 from DSpace/dependabot/maven/org.checkerfram… Check for merge conflicts #1180: Commit 4816235 pushed by 4science-it
November 8, 2024 17:01 2s main
main
November 8, 2024 17:01 2s
Merge pull request #9957 from DSpace/dependabot/maven/net.bytebuddy-b… Check for merge conflicts #1179: Commit dd97a62 pushed by 4science-it
November 8, 2024 16:31 1m 2s main
main
November 8, 2024 16:31 1m 2s
Prepare addon version for the next development iteration Check for merge conflicts #1178: Commit 45392fb pushed by 4science-it
November 7, 2024 20:04 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
November 7, 2024 20:04 2s
[maven-release-plugin] prepare for next development iteration Check for merge conflicts #1177: Commit 404fbb9 pushed by atarix83
November 7, 2024 16:25 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
November 7, 2024 16:25 3s
[maven-release-plugin] prepare release dspace-cris-2023.02.06 Check for merge conflicts #1176: Commit fad89a1 pushed by atarix83
November 7, 2024 16:25 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
November 7, 2024 16:25 3s
Merge pull request #9968 from tdonohue/improve_test_logging Check for merge conflicts #1175: Commit 76355af pushed by 4science-it
November 6, 2024 21:21 3s main
main
November 6, 2024 21:21 3s
Merge pull request #9952 from DSpace/dependabot/maven/build-tools-6d7… Check for merge conflicts #1174: Commit b034b07 pushed by 4science-it
November 5, 2024 17:21 3s main
main
November 5, 2024 17:21 3s
Merge pull request #9947 from saschaszott/patch-52 Check for merge conflicts #1173: Commit d230e22 pushed by 4science-it
November 1, 2024 14:31 2s main
main
November 1, 2024 14:31 2s
Merge pull request #9930 from DSpace/dependabot/maven/apache-commons-… Check for merge conflicts #1172: Commit ac51918 pushed by 4science-it
October 31, 2024 14:51 4s main
main
October 31, 2024 14:51 4s
Merge pull request #9931 from DSpace/dependabot/maven/fasterxml-15c11… Check for merge conflicts #1171: Commit 75edf36 pushed by 4science-it
October 30, 2024 21:01 3s main
main
October 30, 2024 21:01 3s
Merge pull request #9933 from DSpace/dependabot/maven/jakarta-7f9d69d62f Check for merge conflicts #1170: Commit 8d81db8 pushed by 4science-it
October 30, 2024 20:01 2s main
main
October 30, 2024 20:01 2s
Merge pull request #9937 from DSpace/dependabot/maven/org.postgresql-… Check for merge conflicts #1169: Commit 646e88a pushed by 4science-it
October 30, 2024 19:41 2s main
main
October 30, 2024 19:41 2s
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