Skip to content

Commit 04ed7f9

Browse files
committed
Merge tag '25.18.1' into develop
Add missing migrations
2 parents eb07e5b + dd21741 commit 04ed7f9

3 files changed

Lines changed: 67 additions & 1 deletion

File tree

CHANGELOG

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

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

5+
25.18.1 (2025-12-10)
6+
====================
7+
8+
- Add missing migrations
9+
10+
25.18.0
11+
=======
12+
13+
- TODO: add date and notes
14+
15+
25.17.7 ~ 25.17.10
16+
==================
17+
18+
- TODO: add date and notes
19+
520
25.17.6 (2025-10-11)
621
====================
722

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Generated by Django 4.2.17 on 2025-12-09 19:10
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('osf', '0033_merge_20250915_2100'),
10+
]
11+
12+
operations = [
13+
migrations.CreateModel(
14+
name='AzureBlobStorageFileNode',
15+
fields=[
16+
],
17+
options={
18+
'proxy': True,
19+
'indexes': [],
20+
'constraints': [],
21+
},
22+
bases=('osf.basefilenode',),
23+
),
24+
migrations.AlterField(
25+
model_name='basefilenode',
26+
name='type',
27+
field=models.CharField(choices=[('osf.azureblobstoragefile', 'azure blob storage file'), ('osf.azureblobstoragefilenode', 'azure blob storage file node'), ('osf.azureblobstoragefolder', 'azure blob storage folder'), ('osf.bitbucketfile', 'bitbucket file'), ('osf.bitbucketfilenode', 'bitbucket file node'), ('osf.bitbucketfolder', 'bitbucket folder'), ('osf.boxfile', 'box file'), ('osf.boxfilenode', 'box file node'), ('osf.boxfolder', 'box folder'), ('osf.dataversefile', 'dataverse file'), ('osf.dataversefilenode', 'dataverse file node'), ('osf.dataversefolder', 'dataverse folder'), ('osf.dropboxfile', 'dropbox file'), ('osf.dropboxfilenode', 'dropbox file node'), ('osf.dropboxfolder', 'dropbox folder'), ('osf.figsharefile', 'figshare file'), ('osf.figsharefilenode', 'figshare file node'), ('osf.figsharefolder', 'figshare folder'), ('osf.githubfile', 'github file'), ('osf.githubfilenode', 'github file node'), ('osf.githubfolder', 'github folder'), ('osf.gitlabfile', 'git lab file'), ('osf.gitlabfilenode', 'git lab file node'), ('osf.gitlabfolder', 'git lab folder'), ('osf.googledrivefile', 'google drive file'), ('osf.googledrivefilenode', 'google drive file node'), ('osf.googledrivefolder', 'google drive folder'), ('osf.onedrivefile', 'one drive file'), ('osf.onedrivefilenode', 'one drive file node'), ('osf.onedrivefolder', 'one drive folder'), ('osf.osfstoragefile', 'osf storage file'), ('osf.osfstoragefilenode', 'osf storage file node'), ('osf.osfstoragefolder', 'osf storage folder'), ('osf.owncloudfile', 'owncloud file'), ('osf.owncloudfilenode', 'owncloud file node'), ('osf.owncloudfolder', 'owncloud folder'), ('osf.s3file', 's3 file'), ('osf.s3filenode', 's3 file node'), ('osf.s3folder', 's3 folder'), ('osf.trashedfile', 'trashed file'), ('osf.trashedfilenode', 'trashed file node'), ('osf.trashedfolder', 'trashed folder')], db_index=True, max_length=255),
28+
),
29+
migrations.CreateModel(
30+
name='AzureBlobStorageFile',
31+
fields=[
32+
],
33+
options={
34+
'proxy': True,
35+
'indexes': [],
36+
'constraints': [],
37+
},
38+
bases=('osf.azureblobstoragefilenode', models.Model),
39+
),
40+
migrations.CreateModel(
41+
name='AzureBlobStorageFolder',
42+
fields=[
43+
],
44+
options={
45+
'proxy': True,
46+
'indexes': [],
47+
'constraints': [],
48+
},
49+
bases=('osf.azureblobstoragefilenode', models.Model),
50+
),
51+
]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "OSF",
3-
"version": "25.18.0",
3+
"version": "25.18.1",
44
"description": "Facilitating Open Science",
55
"repository": "https://github.com/CenterForOpenScience/osf.io",
66
"author": "Center for Open Science",

0 commit comments

Comments
 (0)