From b451de0d6de4df6bc66b274cec73b919f823d5ae Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sat, 14 Aug 2010 02:13:00 -0300
Subject: Deletes trailing whitespaces (over text files only find * -type f
 -exec sed 's/[ \t]*$//' -i {} \;)

---
 activesupport/lib/active_support/testing/pending.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support/testing/pending.rb')

diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb
index 21134ff9e2..39d1f50125 100644
--- a/activesupport/lib/active_support/testing/pending.rb
+++ b/activesupport/lib/active_support/testing/pending.rb
@@ -25,13 +25,13 @@ module ActiveSupport
               failed = true
             end
 
-            flunk("<#{description}> did not fail.") unless failed 
+            flunk("<#{description}> did not fail.") unless failed
           end
 
           caller[0] =~ (/(.*):(.*):in `(.*)'/)
           @@pending_cases << "#{$3} at #{$1}, line #{$2}"
           print "P"
-      
+
           @@at_exit ||= begin
             at_exit do
               puts "\nPending Cases:"
@@ -42,7 +42,7 @@ module ActiveSupport
           end
         end
       end
-      
+
     end
   end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 071ddb82812d1336450c9cbc6b317d5edfff3731 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 7 Mar 2011 06:18:32 +0900
Subject: more "SSL everywhere" for GitHub URLs

see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
---
 activesupport/lib/active_support/testing/pending.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support/testing/pending.rb')

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
-- 
cgit v1.2.3