Bump Dependencies (#1456)

* Bump Dependencies * rename octicon trashcan to trash https://github.com/primer/octicons/releases/tag/v12.0.0 * changelog Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: campersau <buchholz.bastian@googlemail.com>
FredrikNoren · Feb 10, 2021 · cdc0e9d · cdc0e9d
1 parent de221a7
commit cdc0e9d
Show file tree

Hide file tree

Showing 5 changed files with 550 additions and 301 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ We are following the [Keep a Changelog](https://keepachangelog.com/) format.
 
 ## [Unreleased](https://github.com/FredrikNoren/ungit/compare/v1.5.15...master)
 
+### Changed
+- Bump Dependencies [#1456](https://github.com/FredrikNoren/ungit/pull/1456)
+
 ## [1.5.15](https://github.com/FredrikNoren/ungit/compare/v1.5.14...v1.5.15)
 
 ### Changed

diff --git a/components/graph/git-graph-actions.js b/components/graph/git-graph-actions.js
@@ -81,7 +81,7 @@ class Move extends ActionBase {
 
 class Reset extends ActionBase {
   constructor(graph, node) {
-    super(graph, 'Reset', 'reset', octicons.trashcan.toSVG({ height: 18 }));
+    super(graph, 'Reset', 'reset', octicons.trash.toSVG({ height: 18 }));
     this.node = node;
     this.visible = ko.computed(() => {
       if (this.isRunning()) return true;

diff --git a/components/staging/staging.js b/components/staging/staging.js
@@ -109,7 +109,7 @@ class StagingViewModel {
     this.loadAnyway = false;
     this.isDiagOpen = false;
     this.mutedTime = null;
-    this.discardAllIcon = octicons.trashcan.toSVG({ height: 15 });
+    this.discardAllIcon = octicons.trash.toSVG({ height: 15 });
     this.stashIcon = octicons.pin.toSVG({ height: 15 });
     this.discardIcon = octicons.x.toSVG({ height: 18 });
     this.ignoreIcon = octicons.skip.toSVG({ height: 18 });