diff options
| author | Cyril <jv.cyril@gmail.com> | 2012-09-27 12:25:52 +0200 |
|---|---|---|
| committer | Cyril <jv.cyril@gmail.com> | 2012-09-27 12:25:52 +0200 |
| commit | e563e948bb907a26c4a170eaec0f3976fdf11d74 (patch) | |
| tree | d828329fd0e73bc4ce8272a029cc41a7ddbde7f0 /app/controllers/application_controller.rb | |
| parent | bdf317addc2ae586c76f46ccb1aa8659513baf16 (diff) | |
| parent | a8870e87e4cc8ce441032dc6aa3dfa6e1812090e (diff) | |
| download | gitlab-ce-e563e948bb907a26c4a170eaec0f3976fdf11d74.tar.gz | |
Merge branch 'master' into simplify_controllers2
Conflicts:
app/controllers/commits_controller.rb
app/controllers/refs_controller.rb
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a299a83b96e..c4c99204e03 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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 |