Skip to content

[ENG-11065] Merge latest develop into feature branch (osf.io 26.8.2) #11730

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.

Sign up for GitHub

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

Merged
cslzchen merged 6 commits into from
May 7, 2026
+7 −2
Merged

[ENG-11065] Merge latest develop into feature branch (osf.io 26.8.2) #11730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
884a24a
avoid 502 on creating preprint version from rejected version
mkovalua May 4, 2026
0428d8b
Merge pull request #11723 from mkovalua/fix/ENG-11009
adlius May 4, 2026
e7defb2
Bump version no. Add CHANGELOG
adlius May 6, 2026
37026bf
Merge branch 'hotfix/26.8.2'
adlius May 6, 2026
159b72c
Merge tag '26.8.2' into develop
adlius May 6, 2026
97dc67f
Merge remote-tracking branch 'upstream/develop' into feature/merge-de…
cslzchen May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.

26.8.2 (2026-05-06)
===================

- Hotfix to avoid 502 on creating preprint version from rejected version

26.8.1 (2026-04-30)
===================

Expand Down
2 changes: 1 addition & 1 deletion osf/models/preprint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ def check_unfinished_or_unpublished_version(self):
"""Check and return the "initiated but unfinished version" and "unfinished or unpublished version".
"""
last_not_rejected_version = self.get_last_not_rejected_version()
if last_not_rejected_version.date_published:
if not last_not_rejected_version or last_not_rejected_version.date_published:
return None, None
if last_not_rejected_version.machine_state == 'initial':
return last_not_rejected_version, None
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "OSF",
"version": "26.8.1",
"version": "26.8.2",
"description": "Facilitating Open Science",
"repository": "https://github.com/CenterForOpenScience/osf.io",
"author": "Center for Open Science",
Expand Down