summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/base64.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a67757872d..5d5451419d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 20 23:19:05 2015 Yusuke Endoh <mame@ruby-lang.org>
+
+ * lib/base64.rb: Fix rdoc-formatting for padding argument.
+ [fix GH-905][ci skip] Patch by @davydovanton
+
Wed May 20 13:16:23 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (DEPRECATED_BY): deprecate warning with preferable
diff --git a/lib/base64.rb b/lib/base64.rb
index 30304cd188..bf33124562 100644
--- a/lib/base64.rb
+++ b/lib/base64.rb
@@ -78,7 +78,7 @@ module Base64
# Alphabet'' in RFC 4648.
# The alphabet uses '-' instead of '+' and '_' instead of '/'.
# Note that the result can still contain '='.
- # You can remove the padding by setting "padding" as false.
+ # You can remove the padding by setting +padding+ as false.
def urlsafe_encode64(bin, padding: true)
str = strict_encode64(bin).tr("+/", "-_")
str = str.delete("=") unless padding