summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-16 11:39:42 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-16 11:39:42 +0000
commit1563caf4375bcb63f1a4ac3fa4897263c3c3f98c (patch)
treef18ee2f738580691173c829b45707af4d07c293b
parent3de6edd6041a725aaffba95603d4eb2912627d42 (diff)
parentae13389b0b8654abcffead659788580e8c1f1a15 (diff)
downloadgitlab-ce-1563caf4375bcb63f1a4ac3fa4897263c3c3f98c.tar.gz
Merge branch 'rs-git_not_found' into 'master'
Properly render the `errors/git_not_found` page See merge request !2824
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 48b1f95acb9..2c329b60a19 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -164,7 +164,7 @@ class ApplicationController < ActionController::Base
end
def git_not_found!
- render html: "errors/git_not_found", layout: "errors", status: 404
+ render "errors/git_not_found.html", layout: "errors", status: 404
end
def method_missing(method_sym, *arguments, &block)