summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-02 03:31:56 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-02 03:31:56 +0000
commit87d3c2d6d47e36223d7a6cccf1991b72dc307865 (patch)
tree6867ed2355e1f28935bfd8e64722d14054247b76
parenta60a562ca782b9ceb81f6ef2297521d9479cac2b (diff)
* lib/uri/ftp.rb (URI::FTP.new2): nodoc method from r39013 [Bug #7301]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/uri/ftp.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d1ab8d50ea..d186ad2d68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 2 12:30:00 2013 Zachary Scott <zachary@zacharyscott.net>
+
+ * lib/uri/ftp.rb (URI::FTP.new2): nodoc method from r39013 [Bug #7301]
+
Sat Feb 2 12:15:36 2013 Yusuke Endoh <mame@tsg.ne.jp>
* lib/uri/ftp.rb (URI::FTP.new2): remove the rdoc because it is not
diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb
index db3da6d2c8..9153c88636 100644
--- a/lib/uri/ftp.rb
+++ b/lib/uri/ftp.rb
@@ -46,7 +46,7 @@ module URI
TYPECODE_PREFIX = ';type='.freeze
def self.new2(user, password, host, port, path,
- typecode = nil, arg_check = true)
+ typecode = nil, arg_check = true) # :nodoc:
# Do not use this method! Not tested. [Bug #7301]
# This methods remains just for compatibility,
# Keep it undocumented until the active maintainer is assigned.