Merge branch 'master' into preselected_milestone_while_create_new_issue
This commit is contained in:
commit
f789476241
7 changed files with 243 additions and 186 deletions
|
@ -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
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
%h1 Git Error
|
||||
%hr
|
||||
%p Seems like SSH Key you provided is not a valid SSH key.
|
Loading…
Add table
Add a link
Reference in a new issue