File tree Expand file tree Collapse file tree 3 files changed +7
-2
lines changed
release/share/git-webui/webui/js
src/share/git-webui/webui/js Expand file tree Collapse file tree 3 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -519,6 +519,7 @@ ClassMethod Sync(Msg As %String, Output alert As %String) As %Status
519
519
write " No remote repository configured: skipping fetch, pull and push"
520
520
do ..SyncCommit (Msg )
521
521
} elseif ..InDefaultBranchBasicMode () {
522
+ // Do not commit to default merge branch in basic mode
522
523
write " In Basic mode on default merge branch: skipping commit and push"
523
524
do ..Fetch ()
524
525
do ..Pull ()
Original file line number Diff line number Diff line change @@ -2588,6 +2588,7 @@ webui.NewChangedFilesView = function(workspaceView) {
2588
2588
} ) ;
2589
2589
$ ( "#commitBtn" ) . off ( "click" ) ;
2590
2590
$ ( "#commitBtn" ) . on ( "click" , function ( ) {
2591
+ // Make sure we are not commiting to default merge branch in basic mode
2591
2592
$ . get ( "api/basic-and-default" , function ( data ) {
2592
2593
var basicAndDefault = JSON . parse ( data ) [ "basic-and-default" ]
2593
2594
if ( basicAndDefault == "1" ) {
@@ -2745,6 +2746,7 @@ webui.NewChangedFilesView = function(workspaceView) {
2745
2746
} ) ;
2746
2747
}
2747
2748
2749
+ // Popup for when trying to commit to default merge branch in basic mode
2748
2750
self . noCommitsOnDefault = function ( ) {
2749
2751
function removePopup ( popup ) {
2750
2752
$ ( popup ) . children ( ".modal-fade" ) . modal ( "hide" ) ;
@@ -2766,7 +2768,7 @@ webui.NewChangedFilesView = function(workspaceView) {
2766
2768
webui . warningIcon +
2767
2769
'</div>' +
2768
2770
'<div class="col-sm-11">' +
2769
- '<p>You cannot commit to the default merge branch while using basic mode. Please switch to another branch.</p>' +
2771
+ '<p>You cannot commit directly to the default merge branch while using basic mode. Please switch to another branch.</p>' +
2770
2772
'</div>' +
2771
2773
'</div>' +
2772
2774
'</div>' +
Original file line number Diff line number Diff line change @@ -2588,6 +2588,7 @@ webui.NewChangedFilesView = function(workspaceView) {
2588
2588
} ) ;
2589
2589
$ ( "#commitBtn" ) . off ( "click" ) ;
2590
2590
$ ( "#commitBtn" ) . on ( "click" , function ( ) {
2591
+ // Make sure we are not commiting to default merge branch in basic mode
2591
2592
$ . get ( "api/basic-and-default" , function ( data ) {
2592
2593
var basicAndDefault = JSON . parse ( data ) [ "basic-and-default" ]
2593
2594
if ( basicAndDefault == "1" ) {
@@ -2745,6 +2746,7 @@ webui.NewChangedFilesView = function(workspaceView) {
2745
2746
} ) ;
2746
2747
}
2747
2748
2749
+ // Popup for when trying to commit to default merge branch in basic mode
2748
2750
self . noCommitsOnDefault = function ( ) {
2749
2751
function removePopup ( popup ) {
2750
2752
$ ( popup ) . children ( ".modal-fade" ) . modal ( "hide" ) ;
@@ -2766,7 +2768,7 @@ webui.NewChangedFilesView = function(workspaceView) {
2766
2768
webui . warningIcon +
2767
2769
'</div>' +
2768
2770
'<div class="col-sm-11">' +
2769
- '<p>You cannot commit to the default merge branch while using basic mode. Please switch to another branch.</p>' +
2771
+ '<p>You cannot commit directly to the default merge branch while using basic mode. Please switch to another branch.</p>' +
2770
2772
'</div>' +
2771
2773
'</div>' +
2772
2774
'</div>' +
You can’t perform that action at this time.
0 commit comments