別プロジェクトのWikiを親に設定できないようにする

Dockerfile

@@ -53,7 +53,6 @@ COPY ./addons/onedrive/requirements.txt /code/addons/onedrive/
 COPY ./addons/onedrivebusiness/requirements.txt /code/addons/onedrivebusiness/
 #COPY ./addons/osfstorage/requirements.txt ./addons/osfstorage/
 COPY ./addons/owncloud/requirements.txt ./addons/owncloud/
-COPY ./addons/s3/requirements.txt ./addons/s3/
 COPY ./addons/twofactor/requirements.txt ./addons/twofactor/
 #COPY ./addons/wiki/requirements.txt ./addons/wiki/
 COPY ./addons/zotero/requirements.txt ./addons/zotero/

addons/base/views.py

@@ -66,6 +66,8 @@
 from website.ember_osf_web.decorators import ember_flag_is_active
 from website.project.utils import serialize_node
 from website.util import rubeus, timestamp, inspect_info  # noqa
+import re
+import json as _json
 
 from osf.features import (
     SLOAN_COI_DISPLAY,
@@ -433,6 +435,14 @@ def get_auth(auth, **kwargs):
         credentials = node.serialize_waterbutler_credentials(provider_name)
         waterbutler_settings = node.serialize_waterbutler_settings(provider_name)
 
+    if is_node_process and provider_settings:
+        # Same limit the file browser shows;
+        # Only osfstorage defines `high_max_file_size`.
+        max_size = getattr(provider_settings.config, 'max_file_size', None)
+        if auth.user and 'high_upload_limit' in auth.user.system_tags:
+            max_size = getattr(provider_settings.config, 'high_max_file_size', None) or max_size
+        waterbutler_settings['max_file_size'] = max_size
+
     if not is_node_process:
         # for only location_id value
         storage = ExportDataLocation.objects.get(pk=location_id)
@@ -582,6 +592,33 @@ def create_waterbutler_log(payload, **kwargs):
                     params=payload
                 )
             if payload.get('email') is True or payload.get('errors'):
+                # Parse structured error info from WaterButler exception repr strings
+                # e.g. "<InvalidParameters(413, {"message_key": "quota_exceeded", ...})>"
+                error_info = None
+                if payload.get('errors'):
+                    for err_str in payload['errors']:
+                        # Try to extract JSON payload embedded in the repr string
+                        json_match = re.search(r'\((?:\d+),\s*(\{.*\})\)', err_str, re.DOTALL)
+                        if json_match:
+                            try:
+                                err_data = _json.loads(json_match.group(1))
+                                message_key = err_data.get('message_key', '')
+                                if message_key == 'quota_exceeded' or 'quota_exceeded' in err_str:
+                                    error_info = {'type': 'quota_exceeded'}
+                                    break
+                                elif err_data.get('oversized_files'):
+                                    error_info = {
+                                        'type': 'oversized',
+                                        'oversized_files': err_data['oversized_files'],
+                                        'max_size': err_data.get('max_size'),
+                                    }
+                                    break
+                            except Exception as e:
+                                logger.warning(
+                                    f'Failed to parse WaterButler error representation string: {err_str}. '
+                                    f'Error: {e}'
+                                )
+
                 mails.send_mail(
                     user.username,
                     mails.FILE_OPERATION_FAILED if payload.get('errors')
@@ -592,7 +629,8 @@ def create_waterbutler_log(payload, **kwargs):
                     source_path=payload['source']['materialized'],
                     source_addon=payload['source']['addon'],
                     destination_addon=payload['destination']['addon'],
-                    osf_support_email=settings.OSF_SUPPORT_EMAIL
+                    osf_support_email=settings.OSF_SUPPORT_EMAIL,
+                    error_info=error_info,
                 )
             if payload.get('errors'):
                 # Action failed but our function succeeded

addons/binderhub/settings/defaults.py

@@ -44,6 +44,7 @@
 ]
 
 MATLAB_RELEASES = [
+    'R2026b',
     'R2026a',
     'R2025b',
     'R2025a',
@@ -56,6 +57,7 @@
 ]
 
 MATLAB_PRODUCTNAMES_MAP = {
+    'R2026b': gen_product_name_list('addons/binderhub/settings/mpm_inputs/mpm_input_r2026b.txt'),
     'R2026a': gen_product_name_list('addons/binderhub/settings/mpm_inputs/mpm_input_r2026a.txt'),
     'R2025b': gen_product_name_list('addons/binderhub/settings/mpm_inputs/mpm_input_r2025b.txt'),
     'R2025a': gen_product_name_list('addons/binderhub/settings/mpm_inputs/mpm_input_r2025a.txt'),

addons/binderhub/settings/mpm_inputs/mpm_input_r2025a.txt

@@ -71,6 +71,24 @@
 
 # destinationFolder=
 
+########################################################################
+## SUPPORT PACKAGE DESTINATION
+########################################################################
+##
+## Specify the full path to the folder where you want to install
+## support packages. If not specified, support packages are installed
+## to the default support package location.
+##
+##   Example:
+##   (Windows) supportPackageDestinationFolder=C:\shared\spkgs
+##   (Linux) supportPackageDestinationFolder=/home/<USER>/spkgs
+##   (Mac) supportPackageDestinationFolder=/home/<USER>/spkgs
+##
+## Set the desired value for supportPackageDestinationFolder and
+## uncomment the following line.
+
+# supportPackageDestinationFolder=
+
 ########################################################################
 ## ACCEPT VENDOR LICENSE AGREEMENTS
 ########################################################################

addons/binderhub/settings/mpm_inputs/mpm_input_r2025b.txt

@@ -71,6 +71,24 @@
 
 # destinationFolder=
 
+########################################################################
+## SUPPORT PACKAGE DESTINATION
+########################################################################
+##
+## Specify the full path to the folder where you want to install
+## support packages. If not specified, support packages are installed
+## to the default support package location.
+##
+##   Example:
+##   (Windows) supportPackageDestinationFolder=C:\shared\spkgs
+##   (Linux) supportPackageDestinationFolder=/home/<USER>/spkgs
+##   (Mac) supportPackageDestinationFolder=/home/<USER>/spkgs
+##
+## Set the desired value for supportPackageDestinationFolder and
+## uncomment the following line.
+
+# supportPackageDestinationFolder=
+
 ########################################################################
 ## ACCEPT VENDOR LICENSE AGREEMENTS
 ########################################################################

addons/binderhub/settings/mpm_inputs/mpm_input_r2026a.txt

@@ -71,6 +71,24 @@
 
 # destinationFolder=
 
+########################################################################
+## SUPPORT PACKAGE DESTINATION
+########################################################################
+##
+## Specify the full path to the folder where you want to install
+## support packages. If not specified, support packages are installed
+## to the default support package location.
+##
+##   Example:
+##   (Windows) supportPackageDestinationFolder=C:\shared\spkgs
+##   (Linux) supportPackageDestinationFolder=/home/<USER>/spkgs
+##   (Mac) supportPackageDestinationFolder=/home/<USER>/spkgs
+##
+## Set the desired value for supportPackageDestinationFolder and
+## uncomment the following line.
+
+# supportPackageDestinationFolder=
+
 ########################################################################
 ## ACCEPT VENDOR LICENSE AGREEMENTS
 ########################################################################