Skip to content

Fix error #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

Fix error #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions git-webui/release/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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() {
Expand All @@ -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">';
Expand Down
6 changes: 3 additions & 3 deletions git-webui/src/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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() {
Expand All @@ -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">';
Expand Down
Loading