Skip to content

Commit 9336095

Browse files
committed
Updated modele.xml / changelog, rebuilt WebUI changes
1 parent 6f5cac3 commit 9336095

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [2.5.1] - Unreleased
9+
10+
### Fixed
11+
- Added warnings when user is using incompatible git version
12+
813
## [2.5.0] - 2024-09-24
914

1015
### Added
@@ -13,7 +18,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1318
- Support for editing repo from filesystem perspective via web application (#464)
1419
- Support for downloading a VSCode workspace file from web UI
1520
- IncrementalLoad pull event handler will update the running production, if any (#473)
16-
- Warnings to users if git version is incompatible (#488)
1721

1822
### Fixed
1923
- Instance wide settings are placed in proper global (#444)

git-webui/release/share/git-webui/webui/js/git-webui.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,15 @@ webui.showWarning = function(message) {
110110
'</div>').appendTo(messageBox);
111111
}
112112

113+
webui.gitVersion = function() {
114+
$.get("api/git-version", function(version) {
115+
var ver = JSON.parse(version)["version"];
116+
if (ver < 2.31) {
117+
alert("Your git version is incompatible with git-source-control. Please upgrade to git 2.31.0 or greater.")
118+
}
119+
})
120+
}
121+
113122
webui.git_command = function(command, callback) {
114123
$.ajax({
115124
url: "git-command",
@@ -313,6 +322,7 @@ webui.getNodeIndex = function(element) {
313322

314323
webui.TabBox = function(buttons) {
315324

325+
316326
var self = this;
317327

318328
self.itemClicked = function(event) {
@@ -2808,6 +2818,7 @@ webui.NewChangedFilesView = function(workspaceView) {
28082818
function MainUi() {
28092819

28102820
var self = this;
2821+
webui.gitVersion();
28112822

28122823
self.switchTo = function(element) {
28132824
webui.detachChildren(self.mainView);

module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Document name="git-source-control.ZPM">
44
<Module>
55
<Name>git-source-control</Name>
6-
<Version>2.5.0</Version>
6+
<Version>2.5.1</Version>
77
<Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
88
<Keywords>git source control studio vscode</Keywords>
99
<Packaging>module</Packaging>

0 commit comments

Comments
 (0)