summaryrefslogtreecommitdiff
path: root/config
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 /config
parent6f59f73c1e8a5dd7862e7b7ba8ebd9c59c1022fd (diff)
parent5cf10240f9d8736923c57ff35c5c4acab7de37dc (diff)
downloadgitlab-ce-a65394f35cc83f342e9b2c654cfb32d3eb4c45e7.tar.gz
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 83c3a42c19f..659ea51bc75 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,4 +88,6 @@ Rails.application.routes.draw do
get ':username.keys' => 'profiles/keys#get_keys', constraints: { username: /.*/ }
root to: "root#index"
+
+ get '*unmatched_route', to: 'application#not_found'
end