Merge branch 'main' into adding-missing-icons

primer · Aug 31, 2023 · ada2cd6 · ada2cd6
2 parents 0e01962 + 13c66ae
commit ada2cd6
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 19.7.0
+
+### Minor Changes
+
+- [#980](https://github.com/primer/octicons/pull/980) [`5c207929`](https://github.com/primer/octicons/commit/5c207929bdda29e910f2c5b2f6df9de6ef902b84) Thanks [@gavinmn](https://github.com/gavinmn)! - Fix Feed icon alignment issue and name collision
+
 ## 19.6.0
 
 ### Minor Changes

diff --git a/icons/feed-issue-closed-16.svg b/icons/feed-issue-closed-16.svg
diff --git a/icons/feed-issue-draft-16.svg b/icons/feed-issue-draft-16.svg
diff --git a/icons/feed-issue-open-16.svg b/icons/feed-issue-open-16.svg
diff --git a/icons/feed-issue-reopen-16.svg b/icons/feed-issue-reopen-16.svg
diff --git a/icons/feed-plus-16.svg b/icons/feed-plus-16.svg
diff --git a/icons/feed-public-16.svg b/icons/feed-public-16.svg
diff --git a/icons/feed-pull-request-closed-16.svg b/icons/feed-pull-request-closed-16.svg
diff --git a/icons/feed-pull-request-draft-16.svg b/icons/feed-pull-request-draft-16.svg
diff --git a/icons/feed-pull-request-open-16.svg b/icons/feed-pull-request-open-16.svg
diff --git a/lib/octicons_gem/lib/octicons/version.rb b/lib/octicons_gem/lib/octicons/version.rb
@@ -1,3 +1,3 @@
 module Octicons
-  VERSION = "19.6.0".freeze
+  VERSION = "19.7.0".freeze
 end
diff --git a/lib/octicons_helper/Gemfile b/lib/octicons_helper/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "octicons", "19.6.0"
+gem "octicons", "19.7.0"
 gem "rails"
 
 group :development, :test do

diff --git a/lib/octicons_helper/lib/octicons_helper/version.rb b/lib/octicons_helper/lib/octicons_helper/version.rb
@@ -1,3 +1,3 @@
 module OcticonsHelper
-  VERSION = "19.6.0".freeze
+  VERSION = "19.7.0".freeze
 end
diff --git a/lib/octicons_helper/octicons_helper.gemspec b/lib/octicons_helper/octicons_helper.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_dependency "octicons", "19.6.0"
+  s.add_dependency "octicons", "19.7.0"
   s.add_dependency "railties"
   s.add_dependency "actionview"
 end
diff --git a/lib/octicons_jekyll/Gemfile b/lib/octicons_jekyll/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "octicons", "19.6.0"
+gem "octicons", "19.7.0"
 
 group :development, :test do
   gem "minitest"

diff --git a/lib/octicons_jekyll/jekyll-octicons.gemspec b/lib/octicons_jekyll/jekyll-octicons.gemspec
@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "jekyll", ">= 3.6", "< 5.0"
-  s.add_dependency "octicons", "19.6.0"
+  s.add_dependency "octicons", "19.7.0"
 end
diff --git a/lib/octicons_jekyll/lib/jekyll-octicons/version.rb b/lib/octicons_jekyll/lib/jekyll-octicons/version.rb
@@ -3,6 +3,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class Octicons < Liquid::Tag
-    VERSION = "19.6.0".freeze
+    VERSION = "19.7.0".freeze
   end
 end
diff --git a/lib/octicons_node/package.json b/lib/octicons_node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons",
-  "version": "19.6.0",
+  "version": "19.7.0",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://primer.style/octicons",
   "author": "GitHub Inc.",

diff --git a/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap b/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap
@@ -102,6 +102,7 @@ exports[`@primer/octicons-react should not update exports without a semver chang
   "FeedIssueClosedIcon",
   "FeedIssueDraftIcon",
   "FeedIssueOpenIcon",
+  "FeedIssueReopenIcon",
   "FeedMergedIcon",
   "FeedPersonIcon",
   "FeedPlusIcon",

diff --git a/lib/octicons_react/package.json b/lib/octicons_react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons-react",
-  "version": "19.6.0",
+  "version": "19.7.0",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://primer.style/octicons",
   "author": "GitHub, Inc.",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons",
-  "version": "19.6.0",
+  "version": "19.7.0",
   "publishConfig": {
     "registry": "no registry, don't publish from this package.json."
   },