diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-07 09:16:29 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-07 09:16:29 +0400 |
commit | 79021e674bab1d34609228343fbf3403d9bd9bc6 (patch) | |
tree | 9a700d8521ab105532f483bb84450a51a8bcb1f2 /app | |
parent | 137594dd08e739a68af656d697a5b8c6be23854f (diff) |
Split gitolite backend. Use gitolite_config methods moved to separate class
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
-rw-r--r-- | app/views/errors/invalid_ssh_key.html.haml | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7e53b8fe5ff..2fe2a97460f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -14,10 +14,6 @@ class ApplicationController < ActionController::Base render "errors/gitolite", layout: "error" end - rescue_from Gitlab::Gitolite::InvalidKey do |exception| - render "errors/invalid_ssh_key", layout: "error" - end - rescue_from Encoding::CompatibilityError do |exception| render "errors/encoding", layout: "error", status: 404 end diff --git a/app/views/errors/invalid_ssh_key.html.haml b/app/views/errors/invalid_ssh_key.html.haml deleted file mode 100644 index fb7922b0ea3..00000000000 --- a/app/views/errors/invalid_ssh_key.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -%h1 Git Error -%hr -%p Seems like SSH Key you provided is not a valid SSH key. |