summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-10-15 10:51:16 -0400
committerJacob Schatz <jschatz1@gmail.com>2016-10-15 10:51:16 -0400
commita65394f35cc83f342e9b2c654cfb32d3eb4c45e7 (patch)
tree30eefb73dbf767d42052d2f71bac52bab483b335 /app
parent6f59f73c1e8a5dd7862e7b7ba8ebd9c59c1022fd (diff)
parent5cf10240f9d8736923c57ff35c5c4acab7de37dc (diff)
downloadgitlab-ce-a65394f35cc83f342e9b2c654cfb32d3eb4c45e7.tar.gz
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b3455e04c29..705824502eb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -45,6 +45,10 @@ class ApplicationController < ActionController::Base
redirect_to request.referer.present? ? :back : default, options
end
+ def not_found
+ render_404
+ end
+
protected
# This filter handles both private tokens and personal access tokens