Skip to content

[pull] master from ruby:master #425

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
pull merged 2 commits into from
Nov 2, 2025
Merged

[pull] master from ruby:master #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f827b11
[ruby/erb] Fix typo in documentation
suy Nov 2, 2025
bd51b20
minor code allignment (related to bug 21559)
duerst Nov 2, 2025
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 lib/erb.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@
# ```
#
# You can give `trim_mode: '>'` to suppress the trailing newline
# for each line that ends with `'%<'` (regardless of its beginning):
# for each line that ends with `'%>'` (regardless of its beginning):
#
# ```
# ERB.new(template, trim_mode: '>').result.lines.each {|line| puts line.inspect }
Expand Down
2 changes: 1 addition & 1 deletion lib/unicode_normalize/normalize.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def self.nfc_one(string)
if last_class<accent_class and composite = COMPOSITION_TABLE[start+accent]
start = composite
elsif accent_class == 0
result += start+accents
result << start << accents
start = accent
accents = ''
last_class = -1
Expand Down