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

feat: allow disabling of user centric or repo centric permission sync #51255

Merged
merged 1 commit into from
Apr 28, 2023

Conversation

kopancek
Copy link
Contributor

This is beneficial in cases where one or the other is clearly much faster. It is also beneficial in cases when we have a clash between user centric and repo centric permission sync.

Test plan

It's basically just a site config schema change. Tested locally + unit tests.

This is beneficial in cases where one or the other is clearly much faster.
It is also beneficial in cases when we have a clash between user centric
and repo centric permission sync.
@cla-bot cla-bot bot added the cla-signed label Apr 28, 2023
@kopancek kopancek requested a review from a team April 28, 2023 12:00
@kopancek kopancek self-assigned this Apr 28, 2023
Copy link
Contributor

@vdavid vdavid left a comment

Choose a reason for hiding this comment

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

Makes sense and is definitely backward-compatible. The code LGTM. Thanks for the nicely structured tests!

@kopancek kopancek merged commit cec1bee into main Apr 28, 2023
@kopancek kopancek deleted the milan/allow_disabling_repo_centric_perms_syncing branch April 28, 2023 12:31
@github-actions
Copy link
Contributor

The backport to 5.0 failed:

The process '/usr/bin/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-5.0 5.0
# Navigate to the new working tree
cd .worktrees/backport-5.0
# Create a new branch
git switch --create backport-51255-to-5.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 cec1bee34e42249243080192f593039b3ca0db04
# Push it to GitHub
git push --set-upstream origin backport-51255-to-5.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.0

Then, create a pull request where the base branch is 5.0 and the compare/head branch is backport-51255-to-5.0.

@github-actions github-actions bot added backports failed-backport-to-5.0 release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels Apr 28, 2023
kopancek added a commit that referenced this pull request Apr 28, 2023
kopancek added a commit that referenced this pull request Apr 28, 2023
## Test plan

No test, only changelog change
kopancek added a commit that referenced this pull request May 4, 2023
…permission sync (#51255)

This is beneficial in cases where one or the other is clearly much
faster. It is also beneficial in cases when we have a clash between user
centric and repo centric permission sync.

It's basically just a site config schema change. Tested locally + unit
tests.

(cherry picked from commit cec1bee)
unknwon pushed a commit that referenced this pull request May 4, 2023
…permission sync (#51454)

backport of #51255
- #51255

## Test plan
just a site config schema change, tested locally
@camdencheek camdencheek added backported-to-5.0 and removed release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases failed-backport-to-5.0 labels May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done - Released (available to install)
Development

Successfully merging this pull request may close these issues.

4 participants