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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merged in dspacecris-7-DSC-1438 (pull request #1532) Check for merge conflicts #773: Commit 9386ca8 pushed by 4science-it
January 9, 2024 15:13 2s dspace-cris-7
dspace-cris-7
January 9, 2024 15:13 2s
[DSC-1438] Revert indentation changes Check for merge conflicts #772: Commit db42cf6 pushed by atarix83
January 9, 2024 13:35 2s dspace-cris-2023_02_x-DSC-1438
dspace-cris-2023_02_x-DSC-1438
January 9, 2024 13:35 2s
[DSC-1438] Remove duplicated metadata Check for merge conflicts #771: Commit 4b62f79 pushed by atarix83
January 9, 2024 12:43 2s dspace-cris-2023_02_x-DSC-1438
dspace-cris-2023_02_x-DSC-1438
January 9, 2024 12:43 2s
[DSC-1438] Remove authority.cfg from test folder Check for merge conflicts #770: Commit 57841a2 pushed by atarix83
January 9, 2024 08:29 2s dspace-cris-2023_02_x-DSC-1438
dspace-cris-2023_02_x-DSC-1438
January 9, 2024 08:29 2s
[DSC-1438] Update input form configuration according to input form xl… Check for merge conflicts #769: Commit 2482b01 pushed by atarix83
January 8, 2024 18:00 2s dspace-cris-2023_02_x-DSC-1438
dspace-cris-2023_02_x-DSC-1438
January 8, 2024 18:00 2s
[DSC-1438] Fix tests Check for merge conflicts #768: Commit 2315b9a pushed by atarix83
January 8, 2024 17:40 3s dspace-cris-2023_02_x-DSC-1438
dspace-cris-2023_02_x-DSC-1438
January 8, 2024 17:40 3s
[DSC-1438] Fix checkstyle Check for merge conflicts #767: Commit 7b24d0e pushed by atarix83
January 8, 2024 14:38 2s dspace-cris-2023_02_x-DSC-1438
dspace-cris-2023_02_x-DSC-1438
January 8, 2024 14:38 2s
Merge branch 'dspace-cris-2023_02_x' into dspace-cris-2023_02_x-DSC-1438 Check for merge conflicts #766: Commit a8dbb34 pushed by atarix83
January 8, 2024 14:17 2s dspace-cris-2023_02_x-DSC-1438
dspace-cris-2023_02_x-DSC-1438
January 8, 2024 14:17 2s
Move the development branch to the next version Check for merge conflicts #765: Commit 746cae5 pushed by 4science-it
January 6, 2024 14:03 2s dspace-cris-7
dspace-cris-7
January 6, 2024 14:03 2s
Merged in DSC-1418 (pull request #1511) Check for merge conflicts #764: Commit 0a6b33d pushed by 4science-it
January 5, 2024 15:08 2s dspace-cris-7
dspace-cris-7
January 5, 2024 15:08 2s
Merged in DSC-1435 (pull request #1470) Check for merge conflicts #763: Commit 6805272 pushed by 4science-it
January 5, 2024 11:13 3s dspace-cris-7
dspace-cris-7
January 5, 2024 11:13 3s
Merge pull request #9239 from toniprieto/vocabularies-search-by-metad… Check for merge conflicts #762: Commit 068b1bd pushed by 4science-it
January 4, 2024 07:42 2s main
main
January 4, 2024 07:42 2s
DSC-1461 Allow administrators to always perform PUT/Patches operation… Check for merge conflicts #761: Commit bcaed9b pushed by 4science-it
January 3, 2024 20:28 3s dspace-cris-7
dspace-cris-7
January 3, 2024 20:28 3s
Check for merge conflicts Check for merge conflicts #760: Commit 60f6f54 pushed by atarix83
December 27, 2023 16:37 1s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 27, 2023 16:37 1s
[maven-release-plugin] prepare release dspace-cris-2023.02.01 Check for merge conflicts #759: Commit 8cf6288 pushed by atarix83
December 27, 2023 16:37 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 27, 2023 16:37 2s
[DSC-1350] - Add warning log Check for merge conflicts #758: Commit 59216dc pushed by atarix83
December 27, 2023 15:19 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 27, 2023 15:19 2s
Push selected publications to orcid Check for merge conflicts #757: Pull request #351 synchronize by floriangantner
December 20, 2023 11:33 2s
December 20, 2023 11:33 2s
Merge pull request #8184 from 4Science/CST-5249 Check for merge conflicts #756: Commit 4bf7d17 pushed by 4science-it
December 18, 2023 20:02 2s main
main
December 18, 2023 20:02 2s
[DSC-1438] Remove green orange configurations Check for merge conflicts #755: Commit b00d56a pushed by atarix83
December 18, 2023 17:34 2s dspace-cris-2023_02_x-DSC-1438
dspace-cris-2023_02_x-DSC-1438
December 18, 2023 17:34 2s
Skip processing in EmbeddablePlumXMetricProvider as soon as possible Check for merge conflicts #754: Pull request #407 synchronize by saschaszott
December 13, 2023 14:46 3s
December 13, 2023 14:46 3s
Skip processing in EmbeddablePlumXMetricProvider as soon as possible Check for merge conflicts #753: Pull request #407 synchronize by saschaszott
December 13, 2023 14:46 3s
December 13, 2023 14:46 3s
Skip processing in EmbeddablePlumXMetricProvider as soon as possible Check for merge conflicts #752: Pull request #407 synchronize by saschaszott
December 13, 2023 12:16 2s
December 13, 2023 12:16 2s
Skip processing in EmbeddablePlumXMetricProvider as soon as possible Check for merge conflicts #751: Pull request #407 synchronize by saschaszott
December 13, 2023 11:13 3s
December 13, 2023 11:13 3s
[maven-release-plugin] prepare release dspace-cris-2023.02.00 Check for merge conflicts #750: Commit db3bb81 pushed by atarix83
December 12, 2023 10:28 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 12, 2023 10:28 3s
Merge pull request #9220 from ksankeerth/dev-9215 Check for merge conflicts #749: Commit 344d79b pushed by 4science-it
December 8, 2023 07:42 3s main
main
December 8, 2023 07:42 3s
ProTip! You can narrow down the results and go further in time using created:<2023-12-08 or the other filters available.