From 78a5791e5afcb539675bd8e8d7916126ca28f582 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Tue, 17 Feb 2015 17:57:46 -0800 Subject: [PATCH 1/2] disable cache for now on activity closes #72 --- app/activity.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/activity.rb b/app/activity.rb index a2da5318..84a9e60c 100644 --- a/app/activity.rb +++ b/app/activity.rb @@ -1,5 +1,5 @@ get '/activity' do - expires 7200, :public, :must_revalidate if self.class.production? # 2 hours + #expires 7200, :public, :must_revalidate if self.class.production? # 2 hours params[:activity] = 'global' # FIXME this is a bad hack @events = Event.global_dataset.all erb :'activity' From 1f01baf664089312d70d5b170faf0164bbc93512 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Tue, 17 Feb 2015 18:00:00 -0800 Subject: [PATCH 2/2] non https for hosts --- views/_news.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/_news.erb b/views/_news.erb index 11f10fde..63d8cdaf 100644 --- a/views/_news.erb +++ b/views/_news.erb @@ -61,7 +61,7 @@ <% site_change_filenames.each do |f| %>