Skip to content
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

Fix custom theme path expansion under Ruby 2.4 #753

Merged
merged 1 commit into from
Mar 8, 2017
Merged

Fix custom theme path expansion under Ruby 2.4 #753

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
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@

##### Bug Fixes

* None.
* Fix issue where using a custom theme would crash jazzy when using Ruby 2.4.
[Jason Wray](https://github.com/friedbunny)
[#752](https://github.com/realm/jazzy/issues/752)

## 0.7.4

Expand Down
7 changes: 5 additions & 2 deletions lib/jazzy/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,11 @@ def expand_path(path)
'other assets for a custom theme.',
default: 'apple',
parse: ->(t) do
return expand_path(t) unless t == 'apple' || t == 'fullwidth'
Pathname(__FILE__).parent + 'themes' + t
if t == 'apple' || t == 'fullwidth'
Pathname(__FILE__).parent + 'themes' + t
else
expand_path(t)
end
end

config_attr :use_safe_filenames,
Expand Down