summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-10-17 10:56:55 +0100
committerSean McGivern <sean@gitlab.com>2016-10-17 10:56:55 +0100
commit86dcb79be37f5759dfeaa26283ed8bf031b38d54 (patch)
tree70869aeaa6bfbdcaada873cfd3e4054c62d3e25a /app/controllers/application_controller.rb
parent26e327ea93140f6400b965b845958ff50461718c (diff)
parent052de0600c6b137e6f9df08250b4cf5f38280295 (diff)
downloadgitlab-ce-86dcb79be37f5759dfeaa26283ed8bf031b38d54.tar.gz
Merge branch 'master' into merge-conflicts-editor-2
Diffstat (limited to 'app/controllers/application_controller.rb')
-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 81c0fa26d18..37600ed875c 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