Commit 5221dbfe authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce

parents e322bdbd 71c157e4
class ErrorsController < ApplicationController
end
......@@ -100,8 +100,6 @@ Gitlab::Application.routes.draw do
root to: "dashboard#index"
end
get "errors/githost"
#
# Profile Area
#
......
......@@ -3,7 +3,7 @@ module Gitlab
extend self
def path
%w(admin dashboard groups help profile projects search public assets u s teams merge_requests issues users snippets services repository hooks notes)
%w(admin dashboard files groups help profile projects search public assets u s teams merge_requests issues users snippets services repository hooks notes)
end
end
end
......@@ -111,13 +111,6 @@ describe HelpController, "routing" do
end
end
# errors_githost GET /errors/githost(.:format) errors#githost
describe ErrorsController, "routing" do
it "to #githost" do
get("/errors/githost").should route_to('errors#githost')
end
end
# profile_account GET /profile/account(.:format) profile#account
# profile_history GET /profile/history(.:format) profile#history
# profile_password PUT /profile/password(.:format) profile#password_update
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment