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

update branch #6109

Merged
merged 49 commits into from
Jul 13, 2023
Merged

update branch #6109

merged 49 commits into from
Jul 13, 2023

Conversation

Benbenbenin0
Copy link
Contributor

No description provided.

mkeilman and others added 30 commits June 13, 2023 19:57
Also fixes new drift and lens module names. Replace chirp with tau_0
- added default values for simWorkflow
- improved layouts
- improved genesis error handling
* Fix #5974 - adds center to cut point when specified

---------

Co-authored-by: mkeilman <mkeilman@radiasoft.net>
* Fix #5596 Add file_lock concurrency protection
- Fix #5740 ensure serial greater than incoming and on disk
- Fix #5742 restricted critical sections and removed most
- Fix #5743 migrate_guest_to_persistent_user locks new and guest uid
- Fix #5744 simulation_dir uses lock_user
- Fix #5745 validate version in save_simulation_json
- Fix #5746 removed lock on auth.unchecked_get_user
- Fix #5747 complete_registration passed display_name
- Fix #5749 removed auth_db locking, verified all critical sections
- Fix #5750 thread locking only in flask
- Fix #5751 add auth.create_and_login_user for testing
…tion URL, Export as Zip, Python Source) in raydata settings submenu (#5891)
* Fix #5994: make etc/run-jupyterhub.sh work again

- notebook must now be installed explicitly
- serverextension call is no longer needed with the version of notebook we install
- jupyterhub_debug was removed in favor of feature_config.debug but this
needed to be cascaded in the jupyterhub conf jinja

* fix list

* importable package is with an underscore

* install deps so users dont have to

---------

Co-authored-by: Raven <ravenmarieorourke@gmail.com>
gurhar1133 and others added 19 commits June 28, 2023 20:57
Co-authored-by: mkeilman <mkeilman@radiasoft.net>
* Fix #6055 default to tornado api_server in dev mode

* Fix #6074 remove google_tag_manager

---------

Co-authored-by: Raven <ravenmarieorourke@gmail.com>
In 791364f the api_authEmailAuthorized
code was changed from passing the user model we acquired based on
searching by the email token to one acquired by searching for the uid
into auth.login.

Previous behavior: 791364f#diff-109de77eab3047455095be7e4c1f5f1d918083adaa02b87d5c862a8e513e8436L61
Behavior introduced in 791364f: 791364f#diff-109de77eab3047455095be7e4c1f5f1d918083adaa02b87d5c862a8e513e8436R89

But, the uid isn't present on the model. auth.login
creates the user and populates the uid. In the case where we have
multiple records in auth_email_user_t without a uid the query would
return all of the records even though we are looking for just one.

This reverts the behavior to what it was previously.
@Benbenbenin0 Benbenbenin0 merged commit 54156ee into 5702-decimation Jul 13, 2023
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.

6 participants