studio/blender-studio
3
4
Fork 4
Code Issues 37 Pull Requests 2 Projects 1 Releases 5 Wiki Activity

WIP: Switch between FS storage and S3 per static asset #104417

Draft
Anna Sirota wants to merge 4 commits from alternative-storage into main
pull from: alternative-storage
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 4 Files Changed 7 +174 -10
Anna Sirota commented 2024-07-09 12:49:40 +02:00
Owner
Copy Link
No description provided.
Anna Sirota added 2 commits 2024-07-09 12:49:42 +02:00
Anna Sirota added 1 commit 2024-07-09 18:14:52 +02:00
Anna Sirota added 1 commit 2024-07-09 18:15:29 +02:00
This pull request has changes conflicting with the target branch.
  • common/storage.py
  • studio/settings.py
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin alternative-storage:alternative-storage
git checkout alternative-storage
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Priority
High

  
Priority
Low

  
Priority
Normal

  
Status
Archived

  
Status
Confirmed

  
Status
Duplicate

  
Status
Needs Information from User

  
Status
Needs Triage

  
Status
Resolved

  
Type
Bug

  
Type
Content

  
Type
Design

  
Type
Report

  
Type
To Do

  
Type
Web Development

No Label
Priority
High
Priority
Low
Priority
Normal
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Content
Type
Design
Type
Report
Type
To Do
Type
Web Development
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: studio/blender-studio#104417
No description provided.
Delete Branch "alternative-storage"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?