Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update security profiles to allow merge actions for main branches #459

Open
OButlerOcc opened this issue May 9, 2024 · 0 comments · May be fixed by #460
Open

Update security profiles to allow merge actions for main branches #459

OButlerOcc opened this issue May 9, 2024 · 0 comments · May be fixed by #460
Assignees
@OButlerOcc
Labels
enhancement New feature or request

Comments

@OButlerOcc
Copy link
Contributor

OButlerOcc commented May 9, 2024 •
edited

Currently a main branch of a version folder or a model cannot be merged into a branch.
This is a ui problem as it functions fine as far as the back end is concerned.
This update edits the allowed actions for these types of object to allow them to be merged.
We add the MERGE_INTO_ACTION into the allowed admin actions for these types of model/folder, the ui then generates the merge ui for them

closes: MauroDataMapper/mdm-ui#854
@OButlerOcc OButlerOcc added the enhancement New feature or request label May 9, 2024
OButlerOcc added a commit that referenced this issue May 9, 2024
@OButlerOcc
gh-459 Allows main version folders to be merged into other branches
9c66140
@OButlerOcc OButlerOcc linked a pull request May 9, 2024 that will close this issue
Open
@OButlerOcc OButlerOcc changed the title Version folder Merge Update security profile to allow merge actions for main branches May 10, 2024
@OButlerOcc OButlerOcc changed the title Update security profile to allow merge actions for main branches Update security profiles to allow merge actions for main branches May 10, 2024
OButlerOcc added a commit that referenced this issue May 13, 2024
@OButlerOcc
gh-459 updated to allow merging of data models but disallow model mer…
0a5dd64 
…ging if in a versioned folder (merge the folders instead) added a test to test merging main branch source
OButlerOcc added a commit that referenced this issue May 20, 2024
@OButlerOcc
gh-459 Updates that should fix the broken tests caused by the actions…
50ac52b 
… addition
OButlerOcc added a commit that referenced this issue May 21, 2024
@OButlerOcc
gh-459 Tests failing due to widespread changes, narrowing focus
c0ce1c2
OButlerOcc added a commit that referenced this issue May 21, 2024
@OButlerOcc
Revert "gh-459 Updates that should fix the broken tests caused by the…
7a5f1bf 
… actions addition"

This reverts commit 50ac52b.
OButlerOcc added a commit that referenced this issue May 23, 2024
@OButlerOcc
gh-459 Tests Broke
93b6af9
OButlerOcc added a commit that referenced this issue May 23, 2024
@OButlerOcc
gh-459 Tests fixed, hope it passes the pipeline
3d11857
OButlerOcc added a commit that referenced this issue May 24, 2024
@OButlerOcc
gh-459 VersionFolders Fixed
ea51c33
jamesrwelch pushed a commit that referenced this issue May 29, 2024
@OButlerOcc @jamesrwelch
gh-459 Allows main version folders to be merged into other branches
ebc2234
jamesrwelch pushed a commit that referenced this issue May 29, 2024
@OButlerOcc @jamesrwelch
gh-459 updated to allow merging of data models but disallow model mer…
c4a669d 
…ging if in a versioned folder (merge the folders instead) added a test to test merging main branch source
jamesrwelch pushed a commit that referenced this issue May 29, 2024
@OButlerOcc @jamesrwelch
gh-459 Updates that should fix the broken tests caused by the actions…
c6f5efb 
… addition
jamesrwelch pushed a commit that referenced this issue May 29, 2024
@OButlerOcc @jamesrwelch
gh-459 Tests failing due to widespread changes, narrowing focus
1f6ae8c
jamesrwelch pushed a commit that referenced this issue May 29, 2024
@OButlerOcc @jamesrwelch
Revert "gh-459 Updates that should fix the broken tests caused by the…
ca2464e 
… actions addition"

This reverts commit 50ac52b.
jamesrwelch pushed a commit that referenced this issue May 29, 2024
@OButlerOcc @jamesrwelch
gh-459 Tests Broke
6857759
jamesrwelch pushed a commit that referenced this issue May 29, 2024
@OButlerOcc @jamesrwelch
gh-459 Tests fixed, hope it passes the pipeline
c61eb52
jamesrwelch pushed a commit that referenced this issue May 29, 2024
@OButlerOcc @jamesrwelch
gh-459 VersionFolders Fixed
40f41e2
@pjmonks pjmonks mentioned this issue May 30, 2024
Open
OButlerOcc added a commit that referenced this issue Jun 9, 2024
@OButlerOcc
gh-459 so many broken tests
e150713
OButlerOcc added a commit that referenced this issue Jun 9, 2024
@OButlerOcc
gh-459 many tests fixed
ae42c3b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@OButlerOcc OButlerOcc

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

gh-459 Allows main version folders to be merged into other branches MauroDataMapper/mdm-core
1 participant
@OButlerOcc