Skip to content

Commit

Permalink
Merge pull request #544 from primer/release-12.0.0
Browse files Browse the repository at this point in the history
Release 12.0.0
  • Loading branch information
edokoa authored Feb 4, 2021
2 parents cfebd44 + ec99d7b commit c65a996
Show file tree
Hide file tree
Showing 23 changed files with 54 additions and 59 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# Changelog

## Unreleased
# 12.0.0
### 🚀 New Features
- `bug` (https://github.com/primer/octicons/pull/543)
- `multi-select` (https://github.com/primer/octicons/pull/534)

### 💅 Enhancements
- Make octicon helper slightly faster (@jhawthorn & @seejohnrun) (#536)

### 💥 Breaking changes
- Rename 16px `trashcan` icon to `trash` (@fermion 🙇) (https://github.com/primer/octicons/pull/538)

### 🧽Chores
- Dependency updates (#525, #524, #523, #522, #520)

## 11.3.0

Expand Down
2 changes: 1 addition & 1 deletion icons/bug-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/bug-24.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/multi-select-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/multi-select-24.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
2 changes: 1 addition & 1 deletion lib/octicons_gem/lib/octicons/octicon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def initialize(symbol, options = {})
@width = octicon["width"]
@height = octicon["height"]
@keywords = octicon["keywords"]
@options = options
@options = options.dup
@options.merge!({
class: classes,
viewBox: viewbox,
Expand Down
2 changes: 1 addition & 1 deletion lib/octicons_gem/lib/octicons/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Octicons
VERSION = "11.3.0".freeze
VERSION = "12.0.0".freeze
end
2 changes: 1 addition & 1 deletion lib/octicons_helper/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source "https://rubygems.org"

gemspec

gem "octicons", "11.3.0"
gem "octicons", "12.0.0"
gem "rails"

group :development, :test do
Expand Down
6 changes: 3 additions & 3 deletions lib/octicons_helper/lib/octicons_helper/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ module OcticonsHelper
def octicon(symbol, options = {})
return "" if symbol.nil?

cache_key = [symbol, options].to_s
cache_key = [symbol, options]

if octicons_helper_cache[cache_key]
octicons_helper_cache[cache_key]
if tag = octicons_helper_cache[cache_key]
tag
else
icon = Octicons::Octicon.new(symbol, options)

Expand Down
2 changes: 1 addition & 1 deletion lib/octicons_helper/lib/octicons_helper/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module OcticonsHelper
VERSION = "11.3.0".freeze
VERSION = "12.0.0".freeze
end
2 changes: 1 addition & 1 deletion lib/octicons_helper/octicons_helper.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ Gem::Specification.new do |s|

s.require_paths = ["lib"]

s.add_dependency "octicons", "11.3.0"
s.add_dependency "octicons", "12.0.0"
s.add_dependency "rails"
end
2 changes: 1 addition & 1 deletion lib/octicons_jekyll/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source "https://rubygems.org"

gemspec

gem "octicons", "11.3.0"
gem "octicons", "12.0.0"

group :development, :test do
gem "minitest"
Expand Down
2 changes: 1 addition & 1 deletion lib/octicons_jekyll/jekyll-octicons.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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", "11.3.0"
s.add_dependency "octicons", "12.0.0"
end
2 changes: 1 addition & 1 deletion lib/octicons_jekyll/lib/jekyll-octicons/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module Liquid; class Tag; end; end

module Jekyll
class Octicons < Liquid::Tag
VERSION = "11.3.0".freeze
VERSION = "12.0.0".freeze
end
end
14 changes: 4 additions & 10 deletions lib/octicons_node/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/octicons_node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/octicons",
"version": "11.3.0",
"version": "12.0.0",
"description": "A scalable set of icons handcrafted with <3 by GitHub.",
"homepage": "https://octicons.github.com",
"author": "GitHub Inc.",
Expand Down
15 changes: 4 additions & 11 deletions lib/octicons_react/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/octicons_react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/octicons-react",
"version": "11.3.0",
"version": "12.0.0",
"description": "A scalable set of icons handcrafted with <3 by GitHub.",
"homepage": "https://octicons.github.com",
"author": "GitHub, Inc.",
Expand Down
15 changes: 4 additions & 11 deletions lib/octicons_styled/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/octicons_styled/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/styled-octicons",
"version": "11.3.0",
"version": "12.0.0",
"description": "A scalable set of icons handcrafted with <3 by GitHub.",
"homepage": "https://octicons.github.com",
"author": "GitHub, Inc.",
Expand Down
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "11.3.0",
"version": "12.0.0",
"scripts": {
"version": "script/version",
"test": "ava -v tests/*.js",
Expand Down

1 comment on commit c65a996

@vercel
Copy link

@vercel vercel bot commented on c65a996 Feb 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.