Merge branch 'release/0.20'0.20.0.0

Conflicts:
  config/general.yml-example

1 files changed, 1 insertions, 6 deletions

diff --git a/spec/controllers/admin_general_controller_spec.rb b/spec/controllers/admin_general_controller_spec.rb
index 971960762..cc2ec41b4 100644
--- a/spec/controllers/admin_general_controller_spec.rb
+++ b/spec/controllers/admin_general_controller_spec.rb
@@ -8,13 +8,8 @@ describe AdminGeneralController do
         before { basic_auth_login @request }
 
         it "should render the front page" do
-            get :index, :suppress_redirect => 1
-            response.should render_template('index')
-        end
-
-        it "should redirect to include trailing slash" do
             get :index
-            response.should redirect_to admin_general_index_url(:trailing_slash => true)
+            response.should render_template('index')
         end
 
     end