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

Merge branch 'master' into gitlab-flavored-markdown

Browse source
This commit is contained in:
Riyad Preukschas 2012-08-06 01:48:20 +02:00
commit 8e6a7a172e
57 changed files with 331 additions and 1042 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/application_controller.rb
View file

@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
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'
protect_from_forgery
@ -142,4 +143,8 @@ class ApplicationController < ActionController::Base
def render_full_content
@full_content = true
end
def dev_tools
Rack::MiniProfiler.authorize_request
end
end