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.

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

Fix CI on feature branch #1271

Merged

Conversation

newswangerd
Copy link
Member

No description provided.

@newswangerd newswangerd force-pushed the fix/feature-branch-ci branch 2 times, most recently from 52bf975 to b2795c8 Compare May 16, 2022 19:07
@newswangerd newswangerd requested a review from awcrosby May 16, 2022 19:12
.github/template_gitref Outdated Show resolved Hide resolved
Copy link
Contributor

@awcrosby awcrosby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May need to rebase

@newswangerd newswangerd reopened this May 16, 2022
@newswangerd
Copy link
Member Author

May need to rebase

I'd have to rebase the whole feature branch against master

@newswangerd newswangerd force-pushed the feature/rbac-roles branch from f5c3baf to f9af3f4 Compare May 16, 2022 19:51
@newswangerd newswangerd force-pushed the fix/feature-branch-ci branch from 11641fa to d923c06 Compare May 16, 2022 19:56
@newswangerd newswangerd requested a review from awcrosby May 16, 2022 20:06
@newswangerd newswangerd dismissed awcrosby’s stale review May 16, 2022 20:26

He said I could

@newswangerd newswangerd merged commit c884883 into ansible:feature/rbac-roles May 16, 2022
newswangerd added a commit to newswangerd/galaxy_ng that referenced this pull request Jun 2, 2022
newswangerd added a commit to newswangerd/galaxy_ng that referenced this pull request Jun 2, 2022
newswangerd added a commit that referenced this pull request Jun 3, 2022
newswangerd added a commit to newswangerd/galaxy_ng that referenced this pull request Jun 3, 2022
awcrosby pushed a commit to awcrosby/galaxy_ng that referenced this pull request Jul 29, 2022
awcrosby pushed a commit that referenced this pull request Aug 1, 2022
newswangerd added a commit to newswangerd/galaxy_ng that referenced this pull request Aug 10, 2022
newswangerd added a commit that referenced this pull request Aug 10, 2022
newswangerd added a commit to newswangerd/galaxy_ng that referenced this pull request Aug 11, 2022
newswangerd added a commit that referenced this pull request Aug 15, 2022
* Revert "Revert RBAC Roles (#1205)" (#1212)
* Fix CI on feature branches (#1271)
* Fix groups on namespaces and container namespaces. (#1269)
* Update pulp_container to 2.12, pulpcore to 3.19 (#1272) Issue: AAH-1526
* Migrate permissions from Groups to Roles (#1199) Issue: AAH-1128
* Upgrade to pulpcore 3.20 (#1279) Issue: AAH-1643
* Add python package name to AppConfig (#1314)  No-Issue
* Make roles and group/roles visible for users with group permission (#1316)  No-Issue
* Don't require 'view_group' permissions (#1367) Issue: AAH-1805
* Allow roles assignment to group with `change_group` permission (#1371) Issue: AAH-1766
* Remove deprecated media type from pulp_container. (#1380) Issue: AAH-1828
* Update pulp dependencies from commit hashes to pinned versions (#1381) No-Issue
* Resolve guardian foreign key contraints in rbac migration (#1384) Issue: AAH-1765
* Fix bug preventing users with object permissions from adding groups to container namespaces. (#1387) Issue: AAH-1757
* Make my permissions work with proxy models. (#1389) No-Issue
* Add RBAC roles tests (#1283) Issue: AAH-1609
* Resolve test issues after rebase to master (#1392) No-Issue
* Remove guardian from LDAP on rbac-roles branch. (#1394) No-Issue
* Mark current rbac roles, group test standalone_only (#1395) No-Issue
* Add RBAC object tests (#1391) Issue: AAH-1850
* Add RBAC Roles CI workflow (#1398) No-Issue
* Rename migrations to not override default branch (#1401) No-Issue
* Add role check to app auth unit test (#1402) No-Issue
* Clear out old django model permissions (#1404) No-Issue
* Upgrade pulp container (#1399) No-Issue
* Check expected state and behavior of group permissions (#1403) No-Issue

Co-authored-by: David Newswanger <[email protected]>
Signed-off-by: James Tanner <[email protected]>
Co-authored-by: Brian McLaughlin <[email protected]>
Co-authored-by: Jiří Jeřábek <[email protected]>
Co-authored-by: Shaiah Emigh-Doyle <[email protected]>
Co-authored-by: Andrew Crosby <[email protected]>
Co-authored-by: jctanner <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants