Merge branch 'main' of https://github.com/intersystems/git-source-control into issue-693

Author: isc-pbarton

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.11.0] - Unreleased
+## [2.11.0] - 2025-04-23
 
 ### Added
 - Pull event handler that does an IPM uninstall and load to handle deletes (#631)
@@ -15,12 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Expanded Baseline Export to include custom HL7, X12, ASTM schemas and Lookup Tables (#693)
 
 ### Fixed
-- Changing system mode (environment name) in setting spersists after instance restart (#655)
-- Popping from stash is more responsive (#687)
+- Changing system mode (environment name) in settings persists after instance restart (#655)
+- 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)
-
-### Fixed
 - Fixed error running Import All when Git settings file does not exist (#713)
 
 ## [2.10.0] - 2025-02-10

cls/SourceControl/Git/Utils.cls

@@ -2685,8 +2685,8 @@ ClassMethod ConfigureWeb()
     new $Namespace
     set $Namespace = "%SYS"
     write !,"Adding favorites for all users:"
-    set sql = "insert or update into %SYS_Portal.Users (Username, Page, Data) "_
-        "select ID,?,$LISTBUILD(?) from Security.Users"
+    set sql = "insert or update %NOCHECK into %SYS_Portal.Users (Username, Page, Data) "_
+        "select ID,?,? from Security.Users"
     set caption = "Git: "_installNamespace
     set link = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_installNamespace_"/"
     write !,"Adding Git favorite... "
@@ -3198,3 +3198,4 @@ ClassMethod IsSchemaStandard(pName As %String = "") As %Boolean [ Internal ]
 }
 
 }
+

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 = '<div class="diff-view-container panel panel-default">';

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 = '<div class="diff-view-container panel panel-default">';