-
Notifications
You must be signed in to change notification settings - Fork 69
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
OP-1311 | Create 'oh_settings' controller for CRUD for enabled users #486
base: develop
Are you sure you want to change the base?
OP-1311 | Create 'oh_settings' controller for CRUD for enabled users #486
Conversation
@mwithi can you figure out what is going on? I'm using the same branch name as on the CORE, but it looks like |
The problem is that your branch is in your fork and not in the current repository, let me try to find a solution for this... |
Please align with the latest develop, create a PR for CORE, and checks should pass |
@mwithi please what do you mean by "create a PR for CORE" ? There's already a PR on the CORE which is paired with this one (informatici/openhospital-core#1431) |
…-api into OP-1311_move_settings_to_db
From checks: Run git clone --depth=1 --no-single-branch https://github.com/informatici/openhospital-core.git openhospital-core
Cloning into 'openhospital-core'...
~/work/openhospital-api/openhospital-api/openhospital-core ~/work/openhospital-api/openhospital-api
fatal: 'origin/OP-1311_move_settings_to_db' is not a commit and a branch 'OP-1311_move_settings_to_db' cannot be created from it
Already on 'develop'
Your branch is up to date with 'origin/develop'. |
it should not clone "informatici" but your fork... let me try to fix this |
Please merge with develop |
sorry, just merged #478, please resolve conflicts |
…-api into OP-1311_move_settings_to_db
Please align with develop, but checks now will fail because of: |
…-api into OP-1311_move_settings_to_db
Sorry, align with develop again... |
…-api into OP-1311_move_settings_to_db
please align again... |
…-api into OP-1311_move_settings_to_db
…-api into OP-1311_move_settings_to_db
See OP-1312
This PR includes also integration tests for SettingController.
Paired with #1431