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

[Fixes #9106] Implement API for compact permissions #9110

Merged
merged 6 commits into from
Apr 15, 2022
Merged

Conversation

afabiani
Copy link
Member

References: #9106

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates
  • Commits adding new texts do use gettext and have updated .po / .mo files (without location infos)

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

@afabiani afabiani added backport 3.3.x PR should be backported to target version backport 4.x labels Apr 14, 2022
@afabiani afabiani added this to the 4.0.0 milestone Apr 14, 2022
@afabiani afabiani requested a review from giohappy April 14, 2022 15:59
@afabiani afabiani self-assigned this Apr 14, 2022
@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Apr 14, 2022
@giohappy giohappy merged commit c283a5a into master Apr 15, 2022
@github-actions
Copy link
Contributor

The backport to 3.3.x failed:

The process 'git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.3.x 3.3.x
# Navigate to the new working tree
cd .worktrees/backport-3.3.x
# Create a new branch
git switch --create backport-9110-to-3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c283a5a7ec61452941ad17eb5ed3931f0af8a9f3
# Push it to GitHub
git push --set-upstream origin backport-9110-to-3.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.3.x

Then, create a pull request where the base branch is 3.3.x and the compare/head branch is backport-9110-to-3.3.x.

github-actions bot pushed a commit that referenced this pull request Apr 15, 2022
* [Fixes #9106] Implement API for compact permissions

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests
afabiani pushed a commit that referenced this pull request Apr 15, 2022
* [Fixes #9106] Implement API for compact permissions

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

Co-authored-by: Alessio Fabiani <[email protected]>
@afabiani afabiani deleted the ISSUE_9106 branch April 15, 2022 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 3.3.x PR should be backported to target version cla-signed CLA Bot: community license agreement signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants