aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/tasks/tmp.rake
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2012-10-15 10:20:50 -0500
committerJoshua Peek <josh@joshpeek.com>2012-10-15 10:20:50 -0500
commitc800e27ad35ec46f32b5ac4428e5cf7141f95105 (patch)
tree0821e0afaba2a74dec6ea1397ee3cabfd3d10c59 /railties/lib/rails/tasks/tmp.rake
parent7dba1599d9092a8362956a3fab23b2c60eedea63 (diff)
parent46dc6e7786222865309d15a9eaaaf55e3b7d9c1f (diff)
downloadrails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.gz
rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.bz2
rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.zip
Merge branch 'master' into asset-path-helper
Conflicts: railties/test/application/configuration_test.rb
Diffstat (limited to 'railties/lib/rails/tasks/tmp.rake')
-rw-r--r--railties/lib/rails/tasks/tmp.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 0bb64ced95..116988665f 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -1,6 +1,6 @@
namespace :tmp do
desc "Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)"
- task :clear => [ "tmp:sessions:clear", "tmp:cache:clear", "tmp:sockets:clear"]
+ task clear: [ "tmp:sessions:clear", "tmp:cache:clear", "tmp:sockets:clear"]
tmp_dirs = [ 'tmp/sessions',
'tmp/cache',
@@ -13,7 +13,7 @@ namespace :tmp do
tmp_dirs.each { |d| directory d }
desc "Creates tmp directories for sessions, cache, sockets, and pids"
- task :create => tmp_dirs
+ task create: tmp_dirs
namespace :sessions do
# desc "Clears all files in tmp/sessions"