Merge branch 'master' into preselected_milestone_while_create_new_issue

This commit is contained in:
Alex Denisov 2012-09-07 17:20:20 +03:00
commit f789476241
7 changed files with 243 additions and 186 deletions

View file

@ -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

View file

@ -1,3 +0,0 @@
%h1 Git Error
%hr
%p Seems like SSH Key you provided is not a valid SSH key.