diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-27 07:57:36 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-27 07:57:36 +0000 |
| commit | 5221dbfee74e48f379bc06b2848a64243a76270c (patch) | |
| tree | 47ddb9bf99ea6763df8f3b83f8a4f66206de9571 | |
| parent | e322bdbd5ea9de9bf2b7a5c1efb115e294289918 (diff) | |
| parent | 71c157e43b8bc2adfb2a01ee7cbad0baa5bd98bd (diff) | |
| download | gitlab-ce-5221dbfee74e48f379bc06b2848a64243a76270c.tar.gz | |
Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce
| -rw-r--r-- | app/controllers/errors_controller.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/blacklist.rb | 2 | ||||
| -rw-r--r-- | spec/routing/routing_spec.rb | 7 |
4 files changed, 1 insertions, 12 deletions
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb deleted file mode 100644 index a0c8a000fc7..00000000000 --- a/app/controllers/errors_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ErrorsController < ApplicationController -end diff --git a/config/routes.rb b/config/routes.rb index 315c339016b..611e497c9e5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -100,8 +100,6 @@ Gitlab::Application.routes.draw do root to: "dashboard#index" end - get "errors/githost" - # # Profile Area # diff --git a/lib/gitlab/blacklist.rb b/lib/gitlab/blacklist.rb index 2f9091e07df..6bc2c3b487c 100644 --- a/lib/gitlab/blacklist.rb +++ b/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 diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index 1af052d8739..bcbf37e2eeb 100644 --- a/spec/routing/routing_spec.rb +++ b/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 |