Skip to content

Commit 04ca6a0

Browse files
authored
Merge branch 'main' into fix-filename-space
2 parents 311cb7f + d2a5079 commit 04ca6a0

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
- Added environment awareness in configuration, and showing of environment name in UI (#124)
1616
- Warning on sync page if other users have unstaged changes (#493)
1717
- Added "Export System Default Settings" menu item (#544)
18+
- IRIS Business Intelligence items are mapped to the /dfi subdirectory by default (#428)
1819

1920
### Fixed
2021
- Fixed display of other users' username in workspace view on Unix (#530)
@@ -33,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3334
- Remove leading/trailing spaces from input to Configure() (#356)
3435
- Fix branches with special characters not showing in GitUI (#523)
3536
- Fix filenames with spaces not showing correctly in workspace view (#551)
37+
- Removed inaccurate placeholder text for commit message in UI (#406)
3638

3739
## [2.6.0] - 2024-10-07
3840

cls/SourceControl/Git/Utils.cls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,6 +2830,7 @@ ClassMethod SetDefaultMappings(mappingsNode As %String)
28302830
set @mappingsNode@("CLS","UnitTest")="test/"
28312831
set @mappingsNode@("INC","*")="inc/"
28322832
set @mappingsNode@("MAC","*")="rtn/"
2833+
set @mappingsNode@("DFI","*")="dfi/"
28332834
}
28342835

28352836
ClassMethod PrintStreams(streams... As %Stream.FileCharacter)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3041,7 +3041,7 @@ webui.NewChangedFilesView = function(workspaceView) {
30413041
'</div>' +
30423042
'<div class="commit-area col-sm-6">' +
30433043
'<div class="form-group">' +
3044-
'<input type="area" class="form-control" id="commitMsg" placeholder="Enter commit message (required, 72 character limit)">' +
3044+
'<input type="area" class="form-control" id="commitMsg" placeholder="Enter commit message (required)">' +
30453045
'</div>' +
30463046
'<div class="form-group">' +
30473047
'<textarea class="form-control" id="commitMsgDetail" rows="4" placeholder="Enter commit details (optional)"></textarea>' +

git-webui/src/share/git-webui/webui/js/git-webui.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3041,7 +3041,7 @@ webui.NewChangedFilesView = function(workspaceView) {
30413041
'</div>' +
30423042
'<div class="commit-area col-sm-6">' +
30433043
'<div class="form-group">' +
3044-
'<input type="area" class="form-control" id="commitMsg" placeholder="Enter commit message (required, 72 character limit)">' +
3044+
'<input type="area" class="form-control" id="commitMsg" placeholder="Enter commit message (required)">' +
30453045
'</div>' +
30463046
'<div class="form-group">' +
30473047
'<textarea class="form-control" id="commitMsgDetail" rows="4" placeholder="Enter commit details (optional)"></textarea>' +

0 commit comments

Comments
 (0)