Merge branch 'hotfix/0.21.0.21' into rails-3-develop

3 files changed, 1 insertions, 3 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 044f8e10f..e80c6a823 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -132,7 +132,6 @@ class ApplicationController < ActionController::Base
     def validate_session_timestamp
         if session[:user_id] && session.key?(:ttl) && session[:ttl] < SESSION_TTL.ago
             clear_session_credentials
-            redirect_to signin_path
         end
     end
 
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index 9787785db..7a7b35230 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@ load "debug_helpers.rb"
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.21.0.20'
+ALAVETELI_VERSION = '0.21.0.21'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index ae8d4f256..844fcd4e6 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -169,7 +169,6 @@ describe GeneralController, "when showing the frontpage" do
         it 'should end a logged-in session whose ttl has expired' do
             session[:ttl] = Time.now - 4.hours
             get :frontpage
-            response.should redirect_to signin_path
             session[:user_id].should be_nil
         end