diff options
| author | Han Loong Liauw <hanloongliauw@gmail.com> | 2015-10-17 09:32:31 +1100 |
|---|---|---|
| committer | Han Loong Liauw <hanloongliauw@gmail.com> | 2015-10-17 09:32:31 +1100 |
| commit | 02e8beaa0b83a343752ebf60e4fca4482c17f9e3 (patch) | |
| tree | e00847b274daa7fa03fd7a4647154cc2e4d98e85 /app/controllers/application_controller.rb | |
| parent | 0bea5ced8bf4c9306f8f8e912313731a43d16f4c (diff) | |
| parent | c856a7a5934fba13598be09507c2090888f57a39 (diff) | |
| download | gitlab-ce-02e8beaa0b83a343752ebf60e4fca4482c17f9e3.tar.gz | |
Merge branch 'master' into remove-forks-from-projects-settings
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 527c9da0faa..f0124c6bd60 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -30,7 +30,7 @@ class ApplicationController < ActionController::Base rescue_from ActiveRecord::RecordNotFound do |exception| log_exception(exception) - render "errors/not_found", layout: "errors", status: 404 + render_404 end protected @@ -149,12 +149,8 @@ class ApplicationController < ActionController::Base render "errors/access_denied", layout: "errors", status: 404 end - def not_found! - render "errors/not_found", layout: "errors", status: 404 - end - def git_not_found! - render "errors/git_not_found", layout: "errors", status: 404 + render html: "errors/git_not_found", layout: "errors", status: 404 end def method_missing(method_sym, *arguments, &block) |