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

Idle #1590

Closed
wants to merge 8 commits into from
Closed

Idle #1590

wants to merge 8 commits into from

Conversation

maximmasiutin
Copy link
Contributor

No description provided.

@maximmasiutin
Copy link
Contributor Author

When you create a new server and go to the list of pending users, there is an "internal server error" because the index is missing in the dictionary on the line del idle[u["username"]] so we have to check whether the value exist.

@ppigazzini
Copy link
Collaborator

ppigazzini commented Apr 10, 2023

Please rebase to master (I wrote some commands that you could already know) and the force push to your origin to update the PR.

git fetch -p upstream
git switch idle
git rebase -i upstream/master
# this open an editor, you can keep "pick" for the first commit
# and replace "pick" with "squash" for the other commits to squash them
# keep only logically different commits, save and exit
# this open an editor, edit the final commit message, save and exit
git push -f origin idle

@ppigazzini ppigazzini added bug server server side changes labels Apr 10, 2023
@dubslow
Copy link
Contributor

dubslow commented Apr 10, 2023

git checkout master
git reset --hard origin/master
git push -f maximmasiutin # or whatever your name for your github repo is

@maximmasiutin
Copy link
Contributor Author

Made normal commit, thanks to @ppigazzini and @dubslow -- #1592

@dubslow
Copy link
Contributor

dubslow commented Apr 10, 2023

ideally the fix should be in this PR, not in a new one, no reason to spam the repo

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug server server side changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants