From 90c887fa7d0c454b7533e208daefc342dea4d5f3 Mon Sep 17 00:00:00 2001 From: Florent Guilleux Date: Sat, 1 Dec 2012 13:20:39 -0500 Subject: Remove trailing whitespaces --- actionpack/lib/action_dispatch/middleware/flash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch/middleware/flash.rb') diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index 7b18c57420..7d812b9d53 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -82,7 +82,7 @@ module ActionDispatch else new end - + flash.tap(&:sweep) end -- cgit v1.2.3 From 8dc4041a9b2fb0e8bc2bcb72ab93adb8722e62cd Mon Sep 17 00:00:00 2001 From: Florent Guilleux Date: Sat, 1 Dec 2012 13:22:49 -0500 Subject: Revert "Remove trailing whitespaces" This reverts commit 90c887fa7d0c454b7533e208daefc342dea4d5f3. --- actionpack/lib/action_dispatch/middleware/flash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch/middleware/flash.rb') diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index 7d812b9d53..7b18c57420 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -82,7 +82,7 @@ module ActionDispatch else new end - + flash.tap(&:sweep) end -- cgit v1.2.3 From a39ab3a57d71990af221a462b0076b6f44b18056 Mon Sep 17 00:00:00 2001 From: Pablo Torres Date: Sat, 1 Dec 2012 22:05:22 -0500 Subject: Remove nodoc from FlashHash #[]= [ci skip] --- actionpack/lib/action_dispatch/middleware/flash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch/middleware/flash.rb') diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index 7b18c57420..f24e9b8e18 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -105,7 +105,7 @@ module ActionDispatch super end - def []=(k, v) #:nodoc: + def []=(k, v) @discard.delete k @flashes[k] = v end -- cgit v1.2.3