Merge 16070:16110 from trunk.

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 4b22e46fd4d0ac39c7c28e5a6e38003cd79b343a..2a826770d4144b2eafa680ebdd0f189f56de0b79 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,8 +1,15 @@
 class SiteController < ApplicationController
+  layout 'site',:except => [:key]
+
   before_filter :authorize_web
+  before_filter :set_locale
   before_filter :require_user, :only => [:edit]
 
   def export
     render :action => 'index'
   end
+
+  def key
+    expires_in 7.days, :public => true
+  end
 end