Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7384: migration fixes #430

Merged
kilian.schuettler1 merged 2 commits from RED-7384-fp into master 2024-04-05 13:50:14 +02:00
Conversation 6 Commits 2 Files Changed 4 +104 -89
kilian.schuettler1 commented 2024-04-05 13:07:51 +02:00 (Migrated from gitlab.knecon.com)
Copy Link
  • index files from trash aswell
  • merge manual local entries with existing ones during unprocessed changes merge
  • don't add ManualRedactionEntries on local changes for Images

Closes RED-7384

* index files from trash aswell * merge manual local entries with existing ones during unprocessed changes merge * don't add ManualRedactionEntries on local changes for Images Closes RED-7384
kilian.schuettler1 commented 2024-04-05 13:07:51 +02:00 (Migrated from gitlab.knecon.com)
Copy Link

assigned to @kilian.schuettler1

assigned to @kilian.schuettler1
corina.olariu.ext1 (Migrated from gitlab.knecon.com) approved these changes 2024-04-05 13:07:51 +02:00
corina.olariu.ext1 commented 2024-04-05 13:13:31 +02:00 (Migrated from gitlab.knecon.com)
Copy Link

approved this merge request

approved this merge request
kilian.schuettler1 (Migrated from gitlab.knecon.com) scheduled this pull request to auto merge when all checks succeed 2024-04-05 13:17:57 +02:00
kilian.schuettler1 commented 2024-04-05 13:27:43 +02:00 (Migrated from gitlab.knecon.com)
Copy Link

aborted the automatic merge because source branch was updated

aborted the automatic merge because source branch was updated
kilian.schuettler1 commented 2024-04-05 13:27:43 +02:00 (Migrated from gitlab.knecon.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>5bfeec1b - RED-7384: migration fixes</li></ul> [Compare with previous version](/redactmanager/persistence-service/-/merge_requests/430/diffs?diff_id=38270&start_sha=7df02d588a6d07db7022066fb044b95db0aea8b5)
kilian.schuettler1 (Migrated from gitlab.knecon.com) scheduled this pull request to auto merge when all checks succeed 2024-04-05 13:28:10 +02:00
kilian.schuettler1 (Migrated from gitlab.knecon.com) merged commit d7e5e16351 into master 2024-04-05 13:50:14 +02:00
kilian.schuettler1 commented 2024-04-05 13:50:15 +02:00 (Migrated from gitlab.knecon.com)
Copy Link

mentioned in commit d7e5e16351

mentioned in commit d7e5e163519488cee1f00a1ed2ade3e804af7cd0
Sign in to join this conversation.
Reviewers
No Reviewers
corina.olariu.ext1
Labels
Clear labels
renovate
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Marmelator
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Marmelator/persistence-service#430
No description provided.
Delete Branch "RED-7384-fp"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?