Display number of comments in changeset list

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 72de936d7f629eabc83ade79c0fab3a4018c237e..3470db86c0774d43db7fda4dd234690257ae5d91 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery
 
 
   protect_from_forgery
 

-  before_filter :fetch_body
+  before_action :fetch_body

 
   def authorize_web
     if session[:user]
 
   def authorize_web
     if session[:user]


@@ -389,12 +389,6 @@ class ApplicationController < ActionController::Base
     render :action => "timeout"
   end
 
     render :action => "timeout"
   end
 

-  ##
-  # is the requestor logged in?
-  def logged_in?
-    !@user.nil?
-  end
-

   ##
   # ensure that there is a "this_user" instance variable
   def lookup_this_user
   ##
   # ensure that there is a "this_user" instance variable
   def lookup_this_user


@@ -454,11 +448,11 @@ class ApplicationController < ActionController::Base
 
   # extract authorisation credentials from headers, returns user = nil if none
   def get_auth_data
 
   # extract authorisation credentials from headers, returns user = nil if none
   def get_auth_data

-    if request.env.key? "X-HTTP_AUTHORIZATION"          # where mod_rewrite might have put it
+    if request.env.key? "X-HTTP_AUTHORIZATION" # where mod_rewrite might have put it

       authdata = request.env["X-HTTP_AUTHORIZATION"].to_s.split
       authdata = request.env["X-HTTP_AUTHORIZATION"].to_s.split

-    elsif request.env.key? "REDIRECT_X_HTTP_AUTHORIZATION"          # mod_fcgi
+    elsif request.env.key? "REDIRECT_X_HTTP_AUTHORIZATION" # mod_fcgi

       authdata = request.env["REDIRECT_X_HTTP_AUTHORIZATION"].to_s.split
       authdata = request.env["REDIRECT_X_HTTP_AUTHORIZATION"].to_s.split

-    elsif request.env.key? "HTTP_AUTHORIZATION"         # regular location
+    elsif request.env.key? "HTTP_AUTHORIZATION" # regular location

       authdata = request.env["HTTP_AUTHORIZATION"].to_s.split
     end
     # only basic authentication supported
       authdata = request.env["HTTP_AUTHORIZATION"].to_s.split
     end
     # only basic authentication supported