aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-03-07 22:11:47 +0100
committerXavier Noria <fxn@hashref.com>2011-03-07 22:11:47 +0100
commit89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af (patch)
tree762f7860f65b7e058016707ef6771b1ff2feb7cb /activesupport/lib/active_support/testing
parent5968d7a65886d3450698889f685eccaf54749f43 (diff)
parentf99db5a6a8295b463325accaefe53ab6c89c9982 (diff)
downloadrails-89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af.tar.gz
rails-89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af.tar.bz2
rails-89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support/testing')
-rw-r--r--activesupport/lib/active_support/testing/pending.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb
index 39d1f50125..3d119e2fba 100644
--- a/activesupport/lib/active_support/testing/pending.rb
+++ b/activesupport/lib/active_support/testing/pending.rb
@@ -1,5 +1,5 @@
# Some code from jeremymcanally's "pending"
-# http://github.com/jeremymcanally/pending/tree/master
+# https://github.com/jeremymcanally/pending/tree/master
module ActiveSupport
module Testing
@@ -45,4 +45,4 @@ module ActiveSupport
end
end
-end \ No newline at end of file
+end