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

Former-commit-id: 5221dbfe

app/controllers/errors_controller.rb

-class ErrorsController < ApplicationController
-end

config/routes.rb

@@ -100,8 +100,6 @@ Gitlab::Application.routes.draw do
     root to: "dashboard#index"
   end
-  get "errors/githost"
-
   #
   # Profile Area
   #

lib/gitlab/blacklist.rb

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

spec/routing/routing_spec.rb

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