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

Dmitriy Zaporozhets
2 parents e322bdbd 71c157e4
Showing 4 changed files with 1 additions and 12 deletions Show diff stats
app/controllers/errors_controller.rb
config/routes.rb
lib/gitlab/blacklist.rb
spec/routing/routing_spec.rb
@@ -1,2 +0,0 @@
-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, &quot;routing&quot; 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
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-class ErrorsController < ApplicationController
2	-end
	@@ -3,7 +3,7 @@ module Gitlab		@@ -3,7 +3,7 @@ module Gitlab
3	extend self	3	extend self
4		4
5	def path	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	end	7	end
8	end	8	end
9	end	9	end
	@@ -111,13 +111,6 @@ describe HelpController, "routing" do		@@ -111,13 +111,6 @@ describe HelpController, "routing" do
111	end	111	end
112	end	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	# profile_account GET /profile/account(.:format) profile#account	114	# profile_account GET /profile/account(.:format) profile#account
122	# profile_history GET /profile/history(.:format) profile#history	115	# profile_history GET /profile/history(.:format) profile#history
123	# profile_password PUT /profile/password(.:format) profile#password_update	116	# profile_password PUT /profile/password(.:format) profile#password_update