[pull] master from nextcloud:master

apps/files/src/components/FileEntry.vue

@@ -277,21 +277,21 @@ export default defineComponent({
 	},
 
 	created() {
-		useHotKey('Enter', this.triggerDefaultAction, {
-			stop: true,
-			prevent: true,
-		})
+		useHotKey('Enter', this.triggerDefaultAction)
 	},
 
 	methods: {
 		formatFileSize,
 
-		triggerDefaultAction() {
+		triggerDefaultAction(event?: KeyboardEvent) {
 			// Don't react to the event if the file row is not active
 			if (!this.isActive) {
 				return
 			}
 
+			event?.preventDefault()
+			event?.stopPropagation()
+
 			this.defaultFileAction?.exec({
 				nodes: [this.source],
 				folder: this.activeFolder!,

build/frontend-legacy/package.json

@@ -68,7 +68,7 @@
     "is-svg": "^6.1.0",
     "libphonenumber-js": "^1.12.42",
     "lodash": "^4.18.1",
-    "marked": "^18.0.5",
+    "marked": "^18.0.7",
     "moment": "^2.30.1",
     "moment-timezone": "^0.6.2",
     "p-limit": "^7.3.1",

core/Service/CronService.php

@@ -226,21 +226,33 @@ private function runCli(string $appMode, ?array $jobClasses): void {
 					['app' => 'cron']
 				);
 			}
-
-			if ($memoryIncrease > 50 * 1024 * 1024) {
-				$message = 'Memory leak detected after executing job ' . $jobDetails . '. Memory usage grew by ' . Util::humanFileSize($memoryIncrease) . '.';
+			if ($jobMemoryPeak > (300 * 1024 * 1024)) {
+				$message
+					= 'Cron job used more than 300 MiB of RAM after executing job '
+					. $jobDetails
+					. ': '
+					. Util::humanFileSize($jobMemoryPeak)
+					. ')';
 				$this->logger->warning($message, ['app' => 'cron']);
 				$this->verboseOutput($message);
 			}
-			if ($jobMemoryPeak > 300 * 1024 * 1024) {
-				$message = 'Cron job used more than 300 MiB of RAM after executing job ' . $jobDetails . ': ' . Util::humanFileSize($jobMemoryPeak) . ')';
+
+			// Clean-up
+			$this->setupManager->tearDown();
+			$this->tempManager->clean();
+
+			if ($memoryIncrease > (50 * 1024 * 1024)) {
+				$message
+					= 'Memory leak detected after executing job '
+					. $jobDetails
+					. '. Memory usage grew by '
+					. Util::humanFileSize($memoryIncrease)
+					. '.';
 				$this->logger->warning($message, ['app' => 'cron']);
 				$this->verboseOutput($message);
 			}
 
-			// clean up after unclean jobs
-			$this->setupManager->tearDown();
-			$this->tempManager->clean();
+			// Check forgotten transaction
 			if ($this->connection->inTransaction()) {
 				$this->connection->rollBack();
 				$message = 'Cron job left a transaction opened after executing job ' . $jobDetails . '. The transaction was rolled back.';

dist/ActivityCommentAction-BjD71twg.chunk.mjs → dist/ActivityCommentAction-BGREODgE.chunk.mjs

@@ -1,2 +1,2 @@
-import{a as t}from"./index-Czc5GTr1.chunk.mjs";import{t as m}from"./translation-DoG5ZELJ-hYauSqYO.chunk.mjs";import{C as e,a as p}from"./CommentView-CPZtmu56.chunk.mjs";import{l as i}from"./activity-CAMqbip4.chunk.mjs";import{b as a,r as s,o as n,c,m as u}from"./Web-Cti_s7Nd.chunk.mjs";import{_ as l}from"./public-C1mLBHT3.chunk.mjs";import"./mdi-BmXSqhBI.chunk.mjs";import"./NcModal-DiDvgcU8-Byn0vO0C.chunk.mjs";import"./logger-D3RVzcfQ-C7aw_g9X.chunk.mjs";import"./createElementId-DhjFt1I9-DyhKY9_Z.chunk.mjs";import"./index-kP1pdrFW.chunk.mjs";import"./Check-BCcekaS6.chunk.mjs";import"./TrashCanOutline--zyyOtWX.chunk.mjs";import"./PencilOutline-rDieoUFC.chunk.mjs";import"./NcActionSeparator-B9pNQaji-Oo0JJDSn.chunk.mjs";import"./NcAvatar-1KxMUN7V-B2YSKjzX.chunk.mjs";import"./index-B1wP8tlr.chunk.mjs";import"./util-C9Hc1fff.chunk.mjs";import"./ArrowRight-Bmx0uKvc.chunk.mjs";import"./colors-Cv9F-jWS-xyX99ako.chunk.mjs";import"./NcUserStatusIcon-BF5OEQFU-mN2bb1uW.chunk.mjs";import"./NcActionLink-BFiaYt9A-C1NepubF.chunk.mjs";import"./NcDateTime.vue_vue_type_script_setup_true_lang-BJuPH7S7-BfjdLGR6.chunk.mjs";import"./NcActionText-CQ9qwJ0p-B9DxMewk.chunk.mjs";import"./NcUserBubble-BXR7vT0V-D3Ki-x4R.chunk.mjs";import"./GetComments-KeOYs-CY.chunk.mjs";import"./index-CdlgfEAJ.chunk.mjs";import"./dav-7lRRXOj7.chunk.mjs";import"./externalStorageUtils-C3askeL2.chunk.mjs";const d=a({components:{CommentEntry:p},mixins:[e],props:{reloadCallback:{type:Function,required:!0}},methods:{onNewComment(){try{this.reloadCallback()}catch(o){t(m("comments","Could not reload comments")),i.error("Could not reload comments",{error:o})}}}});function C(o,f,y,b,w,N){const r=s("CommentEntry");return n(),c(r,u(o.editorData,{autoComplete:o.autoComplete,resourceType:o.resourceType,editor:!0,userData:o.userData,resourceId:o.resourceId,class:"comments-action",onNew:o.onNewComment}),null,16,["autoComplete","resourceType","userData","resourceId","onNew"])}const W=l(d,[["render",C],["__scopeId","data-v-099b6b12"]]);export{W as default};
-//# sourceMappingURL=ActivityCommentAction-BjD71twg.chunk.mjs.map
+import{a as t}from"./index-Czc5GTr1.chunk.mjs";import{t as m}from"./translation-DoG5ZELJ-hYauSqYO.chunk.mjs";import{C as e,a as p}from"./CommentView-B6IRjKQM.chunk.mjs";import{l as i}from"./activity-CAMqbip4.chunk.mjs";import{b as a,r as s,o as n,c,m as u}from"./Web-Cti_s7Nd.chunk.mjs";import{_ as l}from"./public-C1mLBHT3.chunk.mjs";import"./mdi-BmXSqhBI.chunk.mjs";import"./NcModal-DiDvgcU8-Byn0vO0C.chunk.mjs";import"./logger-D3RVzcfQ-C7aw_g9X.chunk.mjs";import"./createElementId-DhjFt1I9-DyhKY9_Z.chunk.mjs";import"./index-kP1pdrFW.chunk.mjs";import"./Check-BCcekaS6.chunk.mjs";import"./TrashCanOutline--zyyOtWX.chunk.mjs";import"./PencilOutline-rDieoUFC.chunk.mjs";import"./NcActionSeparator-B9pNQaji-Oo0JJDSn.chunk.mjs";import"./NcAvatar-1KxMUN7V-B2YSKjzX.chunk.mjs";import"./index-B1wP8tlr.chunk.mjs";import"./util-C9Hc1fff.chunk.mjs";import"./ArrowRight-Bmx0uKvc.chunk.mjs";import"./colors-Cv9F-jWS-xyX99ako.chunk.mjs";import"./NcUserStatusIcon-BF5OEQFU-mN2bb1uW.chunk.mjs";import"./NcActionLink-BFiaYt9A-C1NepubF.chunk.mjs";import"./NcDateTime.vue_vue_type_script_setup_true_lang-BJuPH7S7-BfjdLGR6.chunk.mjs";import"./NcActionText-CQ9qwJ0p-B9DxMewk.chunk.mjs";import"./NcUserBubble-BXR7vT0V-D3Ki-x4R.chunk.mjs";import"./GetComments-B6BH90pa.chunk.mjs";import"./index-CdlgfEAJ.chunk.mjs";import"./dav-7lRRXOj7.chunk.mjs";import"./externalStorageUtils-C3askeL2.chunk.mjs";const d=a({components:{CommentEntry:p},mixins:[e],props:{reloadCallback:{type:Function,required:!0}},methods:{onNewComment(){try{this.reloadCallback()}catch(o){t(m("comments","Could not reload comments")),i.error("Could not reload comments",{error:o})}}}});function C(o,f,y,b,w,N){const r=s("CommentEntry");return n(),c(r,u(o.editorData,{autoComplete:o.autoComplete,resourceType:o.resourceType,editor:!0,userData:o.userData,resourceId:o.resourceId,class:"comments-action",onNew:o.onNewComment}),null,16,["autoComplete","resourceType","userData","resourceId","onNew"])}const W=l(d,[["render",C],["__scopeId","data-v-099b6b12"]]);export{W as default};
+//# sourceMappingURL=ActivityCommentAction-BGREODgE.chunk.mjs.map

dist/ActivityCommentEntry-kkC863af.chunk.mjs → dist/ActivityCommentEntry-kE58VsGV.chunk.mjs

@@ -1,2 +1,2 @@
-import{t as s}from"./translation-DoG5ZELJ-hYauSqYO.chunk.mjs";import{C as p,a as i}from"./CommentView-CPZtmu56.chunk.mjs";import{_ as a}from"./public-C1mLBHT3.chunk.mjs";import{r as n,o as c,c as u,m as d}from"./Web-Cti_s7Nd.chunk.mjs";import"./index-kP1pdrFW.chunk.mjs";import"./PencilOutline-rDieoUFC.chunk.mjs";import"./logger-D3RVzcfQ-C7aw_g9X.chunk.mjs";import"./createElementId-DhjFt1I9-DyhKY9_Z.chunk.mjs";import"./NcModal-DiDvgcU8-Byn0vO0C.chunk.mjs";import"./NcActionSeparator-B9pNQaji-Oo0JJDSn.chunk.mjs";import"./NcAvatar-1KxMUN7V-B2YSKjzX.chunk.mjs";import"./index-B1wP8tlr.chunk.mjs";import"./util-C9Hc1fff.chunk.mjs";import"./ArrowRight-Bmx0uKvc.chunk.mjs";import"./colors-Cv9F-jWS-xyX99ako.chunk.mjs";import"./NcUserStatusIcon-BF5OEQFU-mN2bb1uW.chunk.mjs";import"./NcActionLink-BFiaYt9A-C1NepubF.chunk.mjs";import"./NcDateTime.vue_vue_type_script_setup_true_lang-BJuPH7S7-BfjdLGR6.chunk.mjs";import"./NcActionText-CQ9qwJ0p-B9DxMewk.chunk.mjs";import"./Check-BCcekaS6.chunk.mjs";import"./NcUserBubble-BXR7vT0V-D3Ki-x4R.chunk.mjs";import"./TrashCanOutline--zyyOtWX.chunk.mjs";import"./index-Czc5GTr1.chunk.mjs";import"./mdi-BmXSqhBI.chunk.mjs";import"./activity-CAMqbip4.chunk.mjs";import"./GetComments-KeOYs-CY.chunk.mjs";import"./index-CdlgfEAJ.chunk.mjs";import"./dav-7lRRXOj7.chunk.mjs";import"./externalStorageUtils-C3askeL2.chunk.mjs";const l={name:"ActivityCommentEntry",components:{CommentEntry:i},mixins:[p],props:{comment:{type:Object,required:!0},reloadCallback:{type:Function,required:!0}},data(){return{commentMessage:""}},watch:{comment(){this.commentMessage=this.comment.props.message}},mounted(){this.commentMessage=this.comment.props.message},methods:{t:s}};function g(t,e,o,y,m,C){const r=n("CommentEntry");return c(),u(r,d({ref:"comment",tag:"li"},o.comment.props,{autoComplete:t.autoComplete,resourceType:t.resourceType,message:m.commentMessage,resourceId:t.resourceId,userData:t.genMentionsData(o.comment.props.mentions),class:"comments-activity",onDelete:e[0]||(e[0]=f=>o.reloadCallback())}),null,16,["autoComplete","resourceType","message","resourceId","userData"])}const U=a(l,[["render",g],["__scopeId","data-v-2d51dbfd"]]);export{U as default};
-//# sourceMappingURL=ActivityCommentEntry-kkC863af.chunk.mjs.map
+import{t as s}from"./translation-DoG5ZELJ-hYauSqYO.chunk.mjs";import{C as p,a as i}from"./CommentView-B6IRjKQM.chunk.mjs";import{_ as a}from"./public-C1mLBHT3.chunk.mjs";import{r as n,o as c,c as u,m as d}from"./Web-Cti_s7Nd.chunk.mjs";import"./index-kP1pdrFW.chunk.mjs";import"./PencilOutline-rDieoUFC.chunk.mjs";import"./logger-D3RVzcfQ-C7aw_g9X.chunk.mjs";import"./createElementId-DhjFt1I9-DyhKY9_Z.chunk.mjs";import"./NcModal-DiDvgcU8-Byn0vO0C.chunk.mjs";import"./NcActionSeparator-B9pNQaji-Oo0JJDSn.chunk.mjs";import"./NcAvatar-1KxMUN7V-B2YSKjzX.chunk.mjs";import"./index-B1wP8tlr.chunk.mjs";import"./util-C9Hc1fff.chunk.mjs";import"./ArrowRight-Bmx0uKvc.chunk.mjs";import"./colors-Cv9F-jWS-xyX99ako.chunk.mjs";import"./NcUserStatusIcon-BF5OEQFU-mN2bb1uW.chunk.mjs";import"./NcActionLink-BFiaYt9A-C1NepubF.chunk.mjs";import"./NcDateTime.vue_vue_type_script_setup_true_lang-BJuPH7S7-BfjdLGR6.chunk.mjs";import"./NcActionText-CQ9qwJ0p-B9DxMewk.chunk.mjs";import"./Check-BCcekaS6.chunk.mjs";import"./NcUserBubble-BXR7vT0V-D3Ki-x4R.chunk.mjs";import"./TrashCanOutline--zyyOtWX.chunk.mjs";import"./index-Czc5GTr1.chunk.mjs";import"./mdi-BmXSqhBI.chunk.mjs";import"./activity-CAMqbip4.chunk.mjs";import"./GetComments-B6BH90pa.chunk.mjs";import"./index-CdlgfEAJ.chunk.mjs";import"./dav-7lRRXOj7.chunk.mjs";import"./externalStorageUtils-C3askeL2.chunk.mjs";const l={name:"ActivityCommentEntry",components:{CommentEntry:i},mixins:[p],props:{comment:{type:Object,required:!0},reloadCallback:{type:Function,required:!0}},data(){return{commentMessage:""}},watch:{comment(){this.commentMessage=this.comment.props.message}},mounted(){this.commentMessage=this.comment.props.message},methods:{t:s}};function g(t,e,o,y,m,C){const r=n("CommentEntry");return c(),u(r,d({ref:"comment",tag:"li"},o.comment.props,{autoComplete:t.autoComplete,resourceType:t.resourceType,message:m.commentMessage,resourceId:t.resourceId,userData:t.genMentionsData(o.comment.props.mentions),class:"comments-activity",onDelete:e[0]||(e[0]=f=>o.reloadCallback())}),null,16,["autoComplete","resourceType","message","resourceId","userData"])}const U=a(l,[["render",g],["__scopeId","data-v-2d51dbfd"]]);export{U as default};
+//# sourceMappingURL=ActivityCommentEntry-kE58VsGV.chunk.mjs.map