From e5cdc2516fa60599473d925ff7c9e2b71e96dca6 Mon Sep 17 00:00:00 2001 From: Elijah Tamarchenko Date: Tue, 22 Apr 2025 13:44:55 -0400 Subject: [PATCH] Fix error --- CHANGELOG.md | 2 +- git-webui/release/share/git-webui/webui/js/git-webui.js | 6 +++--- git-webui/src/share/git-webui/webui/js/git-webui.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75f7e3e7..af6b44f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Changing system mode (environment name) in setting spersists after instance restart (#655) -- Popping from stash is more responsive (#687) +- Popping from stash is more responsive (#687, #747) - Favorites links for Git pages now works on recent IRIS versions (#734) - IDE editing of decomposed productions now properly handles adds and deletes (#643) diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js index a8ba50aa..ee5a08c4 100644 --- a/git-webui/release/share/git-webui/webui/js/git-webui.js +++ b/git-webui/release/share/git-webui/webui/js/git-webui.js @@ -2008,7 +2008,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi webui.showSuccess("Applied stash item"); parent.update(); self.clear() - }, webui.showWarning(output), webui.showError(output)); + }); } self.popSelectedStash = function() { @@ -2020,7 +2020,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi webui.showSuccess("Popped from stash"); parent.update(); self.clear() - }, webui.showWarning(output), webui.showError(output)); + }); } self.dropSelectedStash = function() { @@ -2032,7 +2032,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi webui.showSuccess("Dropped from stash"); parent.update(); self.clear(); - }, webui.showWarning(output), webui.showError(output)); + }); } var html = '
'; diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js index a8ba50aa..ee5a08c4 100644 --- a/git-webui/src/share/git-webui/webui/js/git-webui.js +++ b/git-webui/src/share/git-webui/webui/js/git-webui.js @@ -2008,7 +2008,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi webui.showSuccess("Applied stash item"); parent.update(); self.clear() - }, webui.showWarning(output), webui.showError(output)); + }); } self.popSelectedStash = function() { @@ -2020,7 +2020,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi webui.showSuccess("Popped from stash"); parent.update(); self.clear() - }, webui.showWarning(output), webui.showError(output)); + }); } self.dropSelectedStash = function() { @@ -2032,7 +2032,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi webui.showSuccess("Dropped from stash"); parent.update(); self.clear(); - }, webui.showWarning(output), webui.showError(output)); + }); } var html = '
';