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 eebb23301d45050e9e532a0ac6ee5f8a45c3c0a2..2a826770d4144b2eafa680ebdd0f189f56de0b79 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,2 +1,15 @@
 class SiteController < ApplicationController
 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
 end