Download as
Browse Code »

Commit 5221dbfee74e48f379bc06b2848a64243a76270c

Authored by Dmitriy Zaporozhets
2 parents e322bdbd 71c157e4
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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

Showing 4 changed files with 1 additions and 12 deletions   Show diff stats
app/controllers/errors_controller.rb
View file @e322bdb
... ... @@ -1,2 +0,0 @@
1   -class ErrorsController < ApplicationController
2   -end
config/routes.rb
  Diff comments   View file @5221dbf
... ... @@ -100,8 +100,6 @@ Gitlab::Application.routes.draw do
100 100 root to: "dashboard#index"
101 101 end
102 102  
103   - get "errors/githost"
104   -
105 103 #
106 104 # Profile Area
107 105 #
... ...
lib/gitlab/blacklist.rb
  Diff comments   View file @5221dbf
... ... @@ -3,7 +3,7 @@ module Gitlab
3 3 extend self
4 4  
5 5 def path
6   - %w(admin dashboard groups help profile projects search public assets u s teams merge_requests issues users snippets services repository hooks notes)
  6 + %w(admin dashboard files groups help profile projects search public assets u s teams merge_requests issues users snippets services repository hooks notes)
7 7 end
8 8 end
9 9 end
... ...
spec/routing/routing_spec.rb
  Diff comments   View file @5221dbf
... ... @@ -111,13 +111,6 @@ describe HelpController, &quot;routing&quot; do
111 111 end
112 112 end
113 113  
114   -# errors_githost GET /errors/githost(.:format) errors#githost
115   -describe ErrorsController, "routing" do
116   - it "to #githost" do
117   - get("/errors/githost").should route_to('errors#githost')
118   - end
119   -end
120   -
121 114 # profile_account GET /profile/account(.:format) profile#account
122 115 # profile_history GET /profile/history(.:format) profile#history
123 116 # profile_password PUT /profile/password(.:format) profile#password_update
... ...