[ENG-5617] Phase 3: Check new develop changes
#10618
Conversation
… Interface (CenterForOpenScience#10608) ## Purpose Adding a boolean attribute to the AbstractProvider model. This change enables administrators to control whether a provider is displayed on the OSF Discover pages directly from the admin interface. ## Changes - Added advertiseOnDiscoverPage boolean field to AbstractProvider - Updated the admin forms and templates to include a checkbox for advertiseOnDiscoverPage - Adjusted the PreprintProviderDisplay view to serialize the new advertiseOnDiscoverPage field --------- Co-authored-by: Uditi Mehta <uditimehta@COSs-MacBook-Pro.local>
…ce#10584) * refactor get_auth * conditionally get credentials and settings from GravyValet --------- Co-authored-by: John Tordoff <>
…ity (CenterForOpenScience#10613) * fix errors retrieving BaseFileNode and file path for metrics --------- Co-authored-by: John Tordoff <> Co-authored-by: Jon Walz <jon@cos.io>
* Don't try to get fileversions for folders --------- Co-authored-by: Jon Walz <walzj@COSs-MBP.lan> Co-authored-by: John Tordoff <Johnetordoff@users.noreply.github.com>
There was a problem hiding this comment.
Looks great and 💯 for handling the merge conflicts. A few requests before I am back on Tuesday, thanks!
- Fix trivial import style in
addons/base/views.py - Update PR title (ticket number, no longer WIP, etc.)
- Add a little bit details to the PR description, this doesn't have to be long, what @ly-mariia mentioned in Slack to me is good enough
- Can any of you verify locally that "after this PR is merged in to the feature branch, there is no conflicts merging the feature branch back to the
develop"?
On question, related to the last item above, I think this 35d5512 is the actual merging develop into feature branch commit that includes conflict fixing. If so, (a note for myself) I will rename it to Merge develop into feature/python-upgrade and fix conflicts.
Another note for myself: back-up the feature branch before merge, create a dedicated phase 3 branch for deployment after merge.
opaduchak
changed the title
develop changes
Indeed, it is. |
cslzchen
merged commit baba6ef
into
CenterForOpenScience:feature/python-upgrade
Purpose
Sync feature/python-upgrade with newest changes from develop.
Mostly everything is fine. From what We have seen, Uditi’s PR should not bring us conflicts. But John’s PR had several nuances for us and caused several conflicts, as function check_access was replaced by check_resource_permissions, several lines in tests were rewritten using nose (which we do not use now), and some functions were rewritten or split.
For now the conflicts were resolved.
Changes
QA Notes
Please make verification statements inspired by your code and what your code touches.
What are the areas of risk?
Any concerns/considerations/questions that development raised?
Documentation
Side Effects
Ticket
https://openscience.atlassian.net/browse/ENG-5617