deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into simplify_controllers2

Browse source 
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
This commit is contained in:
Cyril 2012-09-27 12:25:52 +02:00
commit e563e948bb
108 changed files with 1762 additions and 652 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/application_controller.rb
View file

@ -2,7 +2,6 @@ class ApplicationController < ActionController::Base
before_filter :authenticate_user!
before_filter :reject_blocked!
before_filter :set_current_user_for_mailer
before_filter :check_token_auth
before_filter :set_current_user_for_observers
before_filter :dev_tools if Rails.env == 'development'
@ -24,13 +23,6 @@ class ApplicationController < ActionController::Base
protected
def check_token_auth
# Redirect to login page if not atom feed
if params[:private_token].present? && params[:format] != 'atom'
redirect_to new_user_session_path
end
end
def reject_blocked!
if current_user && current_user.blocked
sign_out current_user
@ -103,7 +95,7 @@ class ApplicationController < ActionController::Base
end
def render_404
render file: File.join(Rails.root, "public", "404"), layout: false, status: "404"
render file: Rails.root.join("public", "404"), layout: false, status: "404"
end
def require_non_empty_project
@ -116,10 +108,6 @@ class ApplicationController < ActionController::Base
response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
end
def render_full_content
@full_content = true
end
def dev_tools
Rack::MiniProfiler.authorize_request
end