From 4f4c401f77522c27df7afdc25eeef39de76e241b Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 04:05:13 -0400
Subject: [PATCH 01/12] Don't instantiate Resque::Server in routes

It still works, and it cleans up the output of `rake routes`.
---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index 84a0c6ab..858111f2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,7 +10,7 @@ Gitlab::Application.routes.draw do
 
   # Optionally, enable Resque here
   require 'resque/server'
-  mount Resque::Server.new, at: '/info/resque', as: 'resque'
+  mount Resque::Server => '/info/resque', as: 'resque'
 
   # Enable Grack support
   mount Grack::Bundle.new({

From 94f91146f15c955b02e9f3717b9bf7506019f63d Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 04:51:26 -0400
Subject: [PATCH 02/12] Limit admin/logs and admin/resque routes to the actions
 that are used

---
 config/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 858111f2..77cde722 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -53,8 +53,8 @@ Gitlab::Application.routes.draw do
     resources :hooks, :only => [:index, :create, :destroy] do
       get :test
     end
-    resource :logs
-    resource :resque, :controller => 'resque'
+    resource :logs, only: [:show]
+    resource :resque, :controller => 'resque', only: [:show]
     root :to => "dashboard#index"
   end
 

From d7eb7970249b662ebcc2673001503a247d7fbe48 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 07:22:46 -0400
Subject: [PATCH 03/12] 1.9 Hash syntax in routes.rb

Also cleans up some alignment and removes unnecessary "to: " arguments
---
 config/routes.rb | 103 ++++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 77cde722..c226a473 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,14 +23,14 @@ Gitlab::Application.routes.draw do
   #
   # Help
   #
-  get 'help' => 'help#index'
-  get 'help/permissions' => 'help#permissions'
-  get 'help/workflow' => 'help#workflow'
-  get 'help/api' => 'help#api'
-  get 'help/web_hooks' => 'help#web_hooks'
+  get 'help'              => 'help#index'
+  get 'help/permissions'  => 'help#permissions'
+  get 'help/workflow'     => 'help#workflow'
+  get 'help/api'          => 'help#api'
+  get 'help/web_hooks'    => 'help#web_hooks'
   get 'help/system_hooks' => 'help#system_hooks'
-  get 'help/markdown' => 'help#markdown'
-  get 'help/ssh' => 'help#ssh'
+  get 'help/markdown'     => 'help#markdown'
+  get 'help/ssh'          => 'help#ssh'
 
   #
   # Admin Area
@@ -43,19 +43,19 @@ Gitlab::Application.routes.draw do
         put :unblock
       end
     end
-    resources :projects, :constraints => { :id => /[^\/]+/ } do
+    resources :projects, constraints: { id: /[^\/]+/ } do
       member do
         get :team
         put :team_update
       end
     end
-    resources :team_members, :only => [:edit, :update, :destroy]
-    resources :hooks, :only => [:index, :create, :destroy] do
+    resources :team_members, only: [:edit, :update, :destroy]
+    resources :hooks, only: [:index, :create, :destroy] do
       get :test
     end
     resource :logs, only: [:show]
-    resource :resque, :controller => 'resque', only: [:show]
-    root :to => "dashboard#index"
+    resource :resque, controller: 'resque', only: [:show]
+    root to: "dashboard#index"
   end
 
   get "errors/githost"
@@ -63,31 +63,32 @@ Gitlab::Application.routes.draw do
   #
   # Profile Area
   #
-  get "profile/account", :to => "profile#account"
-  get "profile/history", :to => "profile#history"
-  put "profile/password", :to => "profile#password_update"
-  get "profile/token", :to => "profile#token"
-  put "profile/reset_private_token", :to => "profile#reset_private_token"
-  get "profile", :to => "profile#show"
-  get "profile/design", :to => "profile#design"
-  put "profile/update", :to => "profile#update"
+  get "profile/account"             => "profile#account"
+  get "profile/history"             => "profile#history"
+  put "profile/password"            => "profile#password_update"
+  get "profile/token"               => "profile#token"
+  put "profile/reset_private_token" => "profile#reset_private_token"
+  get "profile"                     => "profile#show"
+  get "profile/design"              => "profile#design"
+  put "profile/update"              => "profile#update"
+
   resources :keys
 
   #
   # Dashboard Area
   #
-  get "dashboard", :to => "dashboard#index"
-  get "dashboard/issues", :to => "dashboard#issues"
-  get "dashboard/merge_requests", :to => "dashboard#merge_requests"
+  get "dashboard"                => "dashboard#index"
+  get "dashboard/issues"         => "dashboard#issues"
+  get "dashboard/merge_requests" => "dashboard#merge_requests"
 
-  resources :projects, :constraints => { :id => /[^\/]+/ }, :only => [:new, :create]
+  resources :projects, constraints: { id: /[^\/]+/ }, only: [:new, :create]
 
-  devise_for :users, :controllers => { :omniauth_callbacks => :omniauth_callbacks }
+  devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks }
 
   #
   # Project Area
   #
-  resources :projects, :constraints => { :id => /[^\/]+/ }, :except => [:new, :create, :index], :path => "/" do
+  resources :projects, constraints: { id: /[^\/]+/ }, except: [:new, :create, :index], path: "/" do
     member do
       get "team"
       get "wall"
@@ -95,7 +96,7 @@ Gitlab::Application.routes.draw do
       get "files"
     end
 
-    resources :wikis, :only => [:show, :edit, :destroy, :create] do
+    resources :wikis, only: [:show, :edit, :destroy, :create] do
       collection do
         get :pages
       end
@@ -114,46 +115,45 @@ Gitlab::Application.routes.draw do
     end
 
     resources :deploy_keys
-    resources :protected_branches, :only => [:index, :create, :destroy]
+    resources :protected_branches, only: [:index, :create, :destroy]
 
-    resources :refs, :only => [], :path => "/" do
+    resources :refs, only: [], path: "/" do
       collection do
         get "switch"
       end
 
       member do
-        get "tree", :constraints => { :id => /[a-zA-Z.\/0-9_\-]+/ }
-        get "logs_tree", :constraints => { :id => /[a-zA-Z.\/0-9_\-]+/ }
+        get "tree",      constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
+        get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
 
         get "blob",
-          :constraints => {
-            :id => /[a-zA-Z.0-9\/_\-]+/,
-            :path => /.*/
+          constraints: {
+            id:   /[a-zA-Z.0-9\/_\-]+/,
+            path: /.*/
           }
 
-
         # tree viewer
         get "tree/:path" => "refs#tree",
-          :as => :tree_file,
-          :constraints => {
-            :id => /[a-zA-Z.0-9\/_\-]+/,
-            :path => /.*/
+          as: :tree_file,
+          constraints: {
+            id:   /[a-zA-Z.0-9\/_\-]+/,
+            path: /.*/
           }
 
         # tree viewer
         get "logs_tree/:path" => "refs#logs_tree",
-          :as => :logs_file,
-          :constraints => {
-            :id => /[a-zA-Z.0-9\/_\-]+/,
-            :path => /.*/
+          as: :logs_file,
+          constraints: {
+            id:   /[a-zA-Z.0-9\/_\-]+/,
+            path: /.*/
           }
 
         # blame
         get "blame/:path" => "refs#blame",
-          :as => :blame_file,
-          :constraints => {
-            :id => /[a-zA-Z.0-9\/_\-]+/,
-            :path => /.*/
+          as: :blame_file,
+          constraints: {
+            id:   /[a-zA-Z.0-9\/_\-]+/,
+            path: /.*/
           }
       end
     end
@@ -178,7 +178,7 @@ Gitlab::Application.routes.draw do
       end
     end
 
-    resources :hooks, :only => [:index, :create, :destroy] do
+    resources :hooks, only: [:index, :create, :destroy] do
       member do
         get :test
       end
@@ -194,7 +194,7 @@ Gitlab::Application.routes.draw do
     end
     resources :team_members
     resources :milestones
-    resources :labels, :only => [:index]
+    resources :labels, only: [:index]
     resources :issues do
 
       collection do
@@ -203,11 +203,12 @@ Gitlab::Application.routes.draw do
         get   :search
       end
     end
-    resources :notes, :only => [:index, :create, :destroy] do
+    resources :notes, only: [:index, :create, :destroy] do
       collection do
         post :preview
       end
     end
   end
-  root :to => "dashboard#index"
+
+  root to: "dashboard#index"
 end

From 89069dc5f7714472b106914a27c462755ab01396 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 07:31:51 -0400
Subject: [PATCH 04/12] Remove unused ProfileController#password action

---
 app/controllers/profile_controller.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/controllers/profile_controller.rb b/app/controllers/profile_controller.rb
index ba68af2e..7ddbfe11 100644
--- a/app/controllers/profile_controller.rb
+++ b/app/controllers/profile_controller.rb
@@ -16,9 +16,6 @@ class ProfileController < ApplicationController
   def token
   end
 
-  def password
-  end
-
   def password_update
     params[:user].reject!{ |k, v| k != "password" && k != "password_confirmation"}
 

From 83f24de3520ba1c49544b268253a0665831c2bd5 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 04:21:46 -0400
Subject: [PATCH 05/12] Add routing specs

---
 spec/routing/admin_routing_spec.rb | 166 ++++++++
 spec/routing/routing_spec.rb       | 588 +++++++++++++++++++++++++++++
 2 files changed, 754 insertions(+)
 create mode 100644 spec/routing/admin_routing_spec.rb
 create mode 100644 spec/routing/routing_spec.rb

diff --git a/spec/routing/admin_routing_spec.rb b/spec/routing/admin_routing_spec.rb
new file mode 100644
index 00000000..60261c7a
--- /dev/null
+++ b/spec/routing/admin_routing_spec.rb
@@ -0,0 +1,166 @@
+require 'spec_helper'
+
+# team_update_admin_user PUT    /admin/users/:id/team_update(.:format) admin/users#team_update
+#       block_admin_user PUT    /admin/users/:id/block(.:format)       admin/users#block
+#     unblock_admin_user PUT    /admin/users/:id/unblock(.:format)     admin/users#unblock
+#            admin_users GET    /admin/users(.:format)                 admin/users#index
+#                        POST   /admin/users(.:format)                 admin/users#create
+#         new_admin_user GET    /admin/users/new(.:format)             admin/users#new
+#        edit_admin_user GET    /admin/users/:id/edit(.:format)        admin/users#edit
+#             admin_user GET    /admin/users/:id(.:format)             admin/users#show
+#                        PUT    /admin/users/:id(.:format)             admin/users#update
+#                        DELETE /admin/users/:id(.:format)             admin/users#destroy
+describe Admin::UsersController, "routing" do
+  it "to #team_update" do
+    put("/admin/users/1/team_update").should route_to('admin/users#team_update', id: '1')
+  end
+
+  it "to #block" do
+    put("/admin/users/1/block").should route_to('admin/users#block', id: '1')
+  end
+
+  it "to #unblock" do
+    put("/admin/users/1/unblock").should route_to('admin/users#unblock', id: '1')
+  end
+
+  it "to #index" do
+    get("/admin/users").should route_to('admin/users#index')
+  end
+
+  it "to #show" do
+    get("/admin/users/1").should route_to('admin/users#show', id: '1')
+  end
+
+  it "to #create" do
+    post("/admin/users").should route_to('admin/users#create')
+  end
+
+  it "to #new" do
+    get("/admin/users/new").should route_to('admin/users#new')
+  end
+
+  it "to #edit" do
+    get("/admin/users/1/edit").should route_to('admin/users#edit', id: '1')
+  end
+
+  it "to #show" do
+    get("/admin/users/1").should route_to('admin/users#show', id: '1')
+  end
+
+  it "to #update" do
+    put("/admin/users/1").should route_to('admin/users#update', id: '1')
+  end
+
+  it "to #destroy" do
+    delete("/admin/users/1").should route_to('admin/users#destroy', id: '1')
+  end
+end
+
+#        team_admin_project GET    /admin/projects/:id/team(.:format)        admin/projects#team {:id=>/[^\/]+/}
+# team_update_admin_project PUT    /admin/projects/:id/team_update(.:format) admin/projects#team_update {:id=>/[^\/]+/}
+#            admin_projects GET    /admin/projects(.:format)                 admin/projects#index {:id=>/[^\/]+/}
+#                           POST   /admin/projects(.:format)                 admin/projects#create {:id=>/[^\/]+/}
+#         new_admin_project GET    /admin/projects/new(.:format)             admin/projects#new {:id=>/[^\/]+/}
+#        edit_admin_project GET    /admin/projects/:id/edit(.:format)        admin/projects#edit {:id=>/[^\/]+/}
+#             admin_project GET    /admin/projects/:id(.:format)             admin/projects#show {:id=>/[^\/]+/}
+#                           PUT    /admin/projects/:id(.:format)             admin/projects#update {:id=>/[^\/]+/}
+#                           DELETE /admin/projects/:id(.:format)             admin/projects#destroy {:id=>/[^\/]+/}
+describe Admin::ProjectsController, "routing" do
+  it "to #team" do
+    get("/admin/projects/gitlab/team").should route_to('admin/projects#team', id: 'gitlab')
+  end
+
+  it "to #team_update" do
+    put("/admin/projects/gitlab/team_update").should route_to('admin/projects#team_update', id: 'gitlab')
+  end
+
+  it "to #index" do
+    get("/admin/projects").should route_to('admin/projects#index')
+  end
+
+  it "to #create" do
+    post("/admin/projects").should route_to('admin/projects#create')
+  end
+
+  it "to #new" do
+    get("/admin/projects/new").should route_to('admin/projects#new')
+  end
+
+  it "to #edit" do
+    get("/admin/projects/gitlab/edit").should route_to('admin/projects#edit', id: 'gitlab')
+  end
+
+  it "to #show" do
+    get("/admin/projects/gitlab").should route_to('admin/projects#show', id: 'gitlab')
+  end
+
+  it "to #update" do
+    put("/admin/projects/gitlab").should route_to('admin/projects#update', id: 'gitlab')
+  end
+
+  it "to #destroy" do
+    delete("/admin/projects/gitlab").should route_to('admin/projects#destroy', id: 'gitlab')
+  end
+end
+
+# edit_admin_team_member GET    /admin/team_members/:id/edit(.:format) admin/team_members#edit
+#      admin_team_member PUT    /admin/team_members/:id(.:format)      admin/team_members#update
+#                        DELETE /admin/team_members/:id(.:format)      admin/team_members#destroy
+describe Admin::TeamMembersController, "routing" do
+  it "to #edit" do
+    get("/admin/team_members/1/edit").should route_to('admin/team_members#edit', id: '1')
+  end
+
+  it "to #update" do
+    put("/admin/team_members/1").should route_to('admin/team_members#update', id: '1')
+  end
+
+  it "to #destroy" do
+    delete("/admin/team_members/1").should route_to('admin/team_members#destroy', id: '1')
+  end
+end
+
+# admin_hook_test GET    /admin/hooks/:hook_id/test(.:format) admin/hooks#test
+#     admin_hooks GET    /admin/hooks(.:format)               admin/hooks#index
+#                 POST   /admin/hooks(.:format)               admin/hooks#create
+#      admin_hook DELETE /admin/hooks/:id(.:format)           admin/hooks#destroy
+describe Admin::HooksController, "routing" do
+  it "to #test" do
+    get("/admin/hooks/1/test").should route_to('admin/hooks#test', hook_id: '1')
+  end
+
+  it "to #index" do
+    get("/admin/hooks").should route_to('admin/hooks#index')
+  end
+
+  it "to #create" do
+    post("/admin/hooks").should route_to('admin/hooks#create')
+  end
+
+  it "to #destroy" do
+    delete("/admin/hooks/1").should route_to('admin/hooks#destroy', id: '1')
+  end
+
+end
+
+# admin_logs GET    /admin/logs(.:format) admin/logs#show
+describe Admin::LogsController, "routing" do
+  it "to #show" do
+    get("/admin/logs").should route_to('admin/logs#show')
+  end
+end
+
+# admin_resque GET    /admin/resque(.:format) admin/resque#show
+describe Admin::ResqueController, "routing" do
+  it "to #show" do
+    get("/admin/resque").should route_to('admin/resque#show')
+  end
+end
+
+# admin_root        /admin(.:format) admin/dashboard#index
+describe Admin::DashboardController, "routing" do
+  it "to #index" do
+    get("/admin").should route_to('admin/dashboard#index')
+  end
+end
+
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
new file mode 100644
index 00000000..f69422ba
--- /dev/null
+++ b/spec/routing/routing_spec.rb
@@ -0,0 +1,588 @@
+require 'spec_helper'
+
+# Shared examples for a resource inside a Project
+#
+# By default it tests all the default REST actions: index, create, new, edit,
+# show, update, and destroy. You can remove actions by customizing the
+# `actions` variable.
+#
+# It also expects a `controller` variable to be available which defines both
+# the path to the resource as well as the controller name.
+#
+# Examples
+#
+#   # Default behavior
+#   it_behaves_like "RESTful project resources" do
+#     let(:controller) { 'issues' }
+#   end
+#
+#   # Customizing actions
+#   it_behaves_like "RESTful project resources" do
+#     let(:actions)    { [:index] }
+#     let(:controller) { 'issues' }
+#   end
+shared_examples "RESTful project resources" do
+  let(:actions) { [:index, :create, :new, :edit, :show, :update, :destroy] }
+
+  it "to #index" do
+    get("/gitlabhq/#{controller}").should route_to("#{controller}#index", project_id: 'gitlabhq') if actions.include?(:index)
+  end
+
+  it "to #create" do
+    post("/gitlabhq/#{controller}").should route_to("#{controller}#create", project_id: 'gitlabhq') if actions.include?(:create)
+  end
+
+  it "to #new" do
+    get("/gitlabhq/#{controller}/new").should route_to("#{controller}#new", project_id: 'gitlabhq') if actions.include?(:new)
+  end
+
+  it "to #edit" do
+    get("/gitlabhq/#{controller}/1/edit").should route_to("#{controller}#edit", project_id: 'gitlabhq', id: '1') if actions.include?(:edit)
+  end
+
+  it "to #show" do
+    get("/gitlabhq/#{controller}/1").should route_to("#{controller}#show", project_id: 'gitlabhq', id: '1') if actions.include?(:show)
+  end
+
+  it "to #update" do
+    put("/gitlabhq/#{controller}/1").should route_to("#{controller}#update", project_id: 'gitlabhq', id: '1') if actions.include?(:update)
+  end
+
+  it "to #destroy" do
+    delete("/gitlabhq/#{controller}/1").should route_to("#{controller}#destroy", project_id: 'gitlabhq', id: '1') if actions.include?(:destroy)
+  end
+end
+
+# search GET    /search(.:format) search#show
+describe SearchController, "routing" do
+  it "to #show" do
+    get("/search").should route_to('search#show')
+  end
+end
+
+# gitlab_api /api         Gitlab::API
+#     resque /info/resque Resque::Server
+#            /:path       Grack
+describe "Mounted Apps", "routing" do
+  it "to API" do
+    get("/api").should be_routable
+  end
+
+  it "to Resque" do
+    pending
+    get("/info/resque").should be_routable
+  end
+
+  it "to Grack" do
+    get("/gitlabhq.git").should be_routable
+  end
+end
+
+#              help GET    /help(.:format)              help#index
+#  help_permissions GET    /help/permissions(.:format)  help#permissions
+#     help_workflow GET    /help/workflow(.:format)     help#workflow
+#          help_api GET    /help/api(.:format)          help#api
+#    help_web_hooks GET    /help/web_hooks(.:format)    help#web_hooks
+# help_system_hooks GET    /help/system_hooks(.:format) help#system_hooks
+#     help_markdown GET    /help/markdown(.:format)     help#markdown
+#          help_ssh GET    /help/ssh(.:format)          help#ssh
+describe HelpController, "routing" do
+  it "to #index" do
+    get("/help").should route_to('help#index')
+  end
+
+  it "to #permissions" do
+    get("/help/permissions").should route_to('help#permissions')
+  end
+
+  it "to #workflow" do
+    get("/help/workflow").should route_to('help#workflow')
+  end
+
+  it "to #api" do
+    get("/help/api").should route_to('help#api')
+  end
+
+  it "to #web_hooks" do
+    get("/help/web_hooks").should route_to('help#web_hooks')
+  end
+
+  it "to #system_hooks" do
+    get("/help/system_hooks").should route_to('help#system_hooks')
+  end
+
+  it "to #markdown" do
+    get("/help/markdown").should route_to('help#markdown')
+  end
+
+  it "to #ssh" do
+    get("/help/ssh").should route_to('help#ssh')
+  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
+#               profile_token GET    /profile/token(.:format)               profile#token
+# profile_reset_private_token PUT    /profile/reset_private_token(.:format) profile#reset_private_token
+#                     profile GET    /profile(.:format)                     profile#show
+#              profile_design GET    /profile/design(.:format)              profile#design
+#              profile_update PUT    /profile/update(.:format)              profile#update
+describe ProfileController, "routing" do
+  it "to #account" do
+    get("/profile/account").should route_to('profile#account')
+  end
+
+  it "to #history" do
+    get("/profile/history").should route_to('profile#history')
+  end
+
+  it "to #password_update" do
+    put("/profile/password").should route_to('profile#password_update')
+  end
+
+  it "to #token" do
+    get("/profile/token").should route_to('profile#token')
+  end
+
+  it "to #reset_private_token" do
+    put("/profile/reset_private_token").should route_to('profile#reset_private_token')
+  end
+
+  it "to #show" do
+    get("/profile").should route_to('profile#show')
+  end
+
+  it "to #design" do
+    get("/profile/design").should route_to('profile#design')
+  end
+
+  it "to #update" do
+    put("/profile/update").should route_to('profile#update')
+  end
+end
+
+#     keys GET    /keys(.:format)          keys#index
+#          POST   /keys(.:format)          keys#create
+#  new_key GET    /keys/new(.:format)      keys#new
+# edit_key GET    /keys/:id/edit(.:format) keys#edit
+#      key GET    /keys/:id(.:format)      keys#show
+#          PUT    /keys/:id(.:format)      keys#update
+#          DELETE /keys/:id(.:format)      keys#destroy
+describe KeysController, "routing" do
+  it "to #index" do
+    get("/keys").should route_to('keys#index')
+  end
+
+  it "to #create" do
+    post("/keys").should route_to('keys#create')
+  end
+
+  it "to #new" do
+    get("/keys/new").should route_to('keys#new')
+  end
+
+  it "to #edit" do
+    get("/keys/1/edit").should route_to('keys#edit', id: '1')
+  end
+
+  it "to #show" do
+    get("/keys/1").should route_to('keys#show', id: '1')
+  end
+
+  it "to #update" do
+    put("/keys/1").should route_to('keys#update', id: '1')
+  end
+
+  it "to #destroy" do
+    delete("/keys/1").should route_to('keys#destroy', id: '1')
+  end
+end
+
+#                dashboard GET    /dashboard(.:format)                dashboard#index
+#         dashboard_issues GET    /dashboard/issues(.:format)         dashboard#issues
+# dashboard_merge_requests GET    /dashboard/merge_requests(.:format) dashboard#merge_requests
+#                     root        /                                   dashboard#index
+describe DashboardController, "routing" do
+  it "to #index" do
+    get("/dashboard").should route_to('dashboard#index')
+    get("/").should route_to('dashboard#index')
+  end
+
+  it "to #issues" do
+    get("/dashboard/issues").should route_to('dashboard#issues')
+  end
+
+  it "to #merge_requests" do
+    get("/dashboard/merge_requests").should route_to('dashboard#merge_requests')
+  end
+end
+
+#      projects POST   /projects(.:format)     projects#create
+#   new_project GET    /projects/new(.:format) projects#new
+#  team_project GET    /:id/team(.:format)     projects#team
+#  wall_project GET    /:id/wall(.:format)     projects#wall
+# graph_project GET    /:id/graph(.:format)    projects#graph
+# files_project GET    /:id/files(.:format)    projects#files
+#  edit_project GET    /:id/edit(.:format)     projects#edit
+#       project GET    /:id(.:format)          projects#show
+#               PUT    /:id(.:format)          projects#update
+#               DELETE /:id(.:format)          projects#destroy
+describe ProjectsController, "routing" do
+  it "to #create" do
+    post("/projects").should route_to('projects#create')
+  end
+
+  it "to #new" do
+    get("/projects/new").should route_to('projects#new')
+  end
+
+  it "to #team" do
+    get("/gitlabhq/team").should route_to('projects#team', id: 'gitlabhq')
+  end
+
+  it "to #wall" do
+    get("/gitlabhq/wall").should route_to('projects#wall', id: 'gitlabhq')
+  end
+
+  it "to #graph" do
+    get("/gitlabhq/graph").should route_to('projects#graph', id: 'gitlabhq')
+  end
+
+  it "to #files" do
+    get("/gitlabhq/files").should route_to('projects#files', id: 'gitlabhq')
+  end
+
+  it "to #edit" do
+    get("/gitlabhq/edit").should route_to('projects#edit', id: 'gitlabhq')
+  end
+
+  it "to #show" do
+    get("/gitlabhq").should route_to('projects#show', id: 'gitlabhq')
+  end
+
+  it "to #update" do
+    put("/gitlabhq").should route_to('projects#update', id: 'gitlabhq')
+  end
+
+  it "to #destroy" do
+    delete("/gitlabhq").should route_to('projects#destroy', id: 'gitlabhq')
+  end
+end
+
+#        new_user_session GET    /users/sign_in(.:format)               devise/sessions#new
+#            user_session POST   /users/sign_in(.:format)               devise/sessions#create
+#    destroy_user_session DELETE /users/sign_out(.:format)              devise/sessions#destroy
+# user_omniauth_authorize        /users/auth/:provider(.:format)        omniauth_callbacks#passthru
+#  user_omniauth_callback        /users/auth/:action/callback(.:format) omniauth_callbacks#(?-mix:(?!))
+#           user_password POST   /users/password(.:format)              devise/passwords#create
+#       new_user_password GET    /users/password/new(.:format)          devise/passwords#new
+#      edit_user_password GET    /users/password/edit(.:format)         devise/passwords#edit
+#                         PUT    /users/password(.:format)              devise/passwords#update
+describe "Authentication", "routing" do
+  # pending
+end
+
+#  pages_project_wikis GET    /:project_id/wikis/pages(.:format)       wikis#pages
+# history_project_wiki GET    /:project_id/wikis/:id/history(.:format) wikis#history
+#        project_wikis POST   /:project_id/wikis(.:format)             wikis#create
+#    edit_project_wiki GET    /:project_id/wikis/:id/edit(.:format)    wikis#edit
+#         project_wiki GET    /:project_id/wikis/:id(.:format)         wikis#show
+#                      DELETE /:project_id/wikis/:id(.:format)         wikis#destroy
+describe WikisController, "routing" do
+  it "to #pages" do
+    get("/gitlabhq/wikis/pages").should route_to('wikis#pages', project_id: 'gitlabhq')
+  end
+
+  it "to #history" do
+    get("/gitlabhq/wikis/1/history").should route_to('wikis#history', project_id: 'gitlabhq', id: '1')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:actions)    { [:create, :edit, :show, :destroy] }
+    let(:controller) { 'wikis' }
+  end
+end
+
+# branches_project_repository GET    /:project_id/repository/branches(.:format) repositories#branches
+#     tags_project_repository GET    /:project_id/repository/tags(.:format)     repositories#tags
+#  archive_project_repository GET    /:project_id/repository/archive(.:format)  repositories#archive
+#          project_repository POST   /:project_id/repository(.:format)          repositories#create
+#      new_project_repository GET    /:project_id/repository/new(.:format)      repositories#new
+#     edit_project_repository GET    /:project_id/repository/edit(.:format)     repositories#edit
+#                             GET    /:project_id/repository(.:format)          repositories#show
+#                             PUT    /:project_id/repository(.:format)          repositories#update
+#                             DELETE /:project_id/repository(.:format)          repositories#destroy
+describe RepositoriesController, "routing" do
+  it "to #branches" do
+    get("/gitlabhq/repository/branches").should route_to('repositories#branches', project_id: 'gitlabhq')
+  end
+
+  it "to #tags" do
+    get("/gitlabhq/repository/tags").should route_to('repositories#tags', project_id: 'gitlabhq')
+  end
+
+  it "to #archive" do
+    get("/gitlabhq/repository/archive").should route_to('repositories#archive', project_id: 'gitlabhq')
+  end
+
+  it "to #create" do
+    post("/gitlabhq/repository").should route_to('repositories#create', project_id: 'gitlabhq')
+  end
+
+  it "to #new" do
+    get("/gitlabhq/repository/new").should route_to('repositories#new', project_id: 'gitlabhq')
+  end
+
+  it "to #edit" do
+    get("/gitlabhq/repository/edit").should route_to('repositories#edit', project_id: 'gitlabhq')
+  end
+
+  it "to #show" do
+    get("/gitlabhq/repository").should route_to('repositories#show', project_id: 'gitlabhq')
+  end
+
+  it "to #update" do
+    put("/gitlabhq/repository").should route_to('repositories#update', project_id: 'gitlabhq')
+  end
+
+  it "to #destroy" do
+    delete("/gitlabhq/repository").should route_to('repositories#destroy', project_id: 'gitlabhq')
+  end
+end
+
+#     project_deploy_keys GET    /:project_id/deploy_keys(.:format)          deploy_keys#index
+#                         POST   /:project_id/deploy_keys(.:format)          deploy_keys#create
+#  new_project_deploy_key GET    /:project_id/deploy_keys/new(.:format)      deploy_keys#new
+# edit_project_deploy_key GET    /:project_id/deploy_keys/:id/edit(.:format) deploy_keys#edit
+#      project_deploy_key GET    /:project_id/deploy_keys/:id(.:format)      deploy_keys#show
+#                         PUT    /:project_id/deploy_keys/:id(.:format)      deploy_keys#update
+#                         DELETE /:project_id/deploy_keys/:id(.:format)      deploy_keys#destroy
+describe DeployKeysController, "routing" do
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'deploy_keys' }
+  end
+end
+
+# project_protected_branches GET    /:project_id/protected_branches(.:format)     protected_branches#index
+#                            POST   /:project_id/protected_branches(.:format)     protected_branches#create
+#   project_protected_branch DELETE /:project_id/protected_branches/:id(.:format) protected_branches#destroy
+describe ProtectedBranchesController, "routing" do
+  it_behaves_like "RESTful project resources" do
+    let(:actions)    { [:index, :create, :destroy] }
+    let(:controller) { 'protected_branches' }
+  end
+end
+
+#    switch_project_refs GET    /:project_id/switch(.:format)              refs#switch
+#       tree_project_ref GET    /:project_id/:id/tree(.:format)            refs#tree
+#  logs_tree_project_ref GET    /:project_id/:id/logs_tree(.:format)       refs#logs_tree
+#       blob_project_ref GET    /:project_id/:id/blob(.:format)            refs#blob
+#  tree_file_project_ref GET    /:project_id/:id/tree/:path(.:format)      refs#tree
+#  logs_file_project_ref GET    /:project_id/:id/logs_tree/:path(.:format) refs#logs_tree
+# blame_file_project_ref GET    /:project_id/:id/blame/:path(.:format)     refs#blame
+describe RefsController, "routing" do
+  it "to #switch" do
+    get("/gitlabhq/switch").should route_to('refs#switch', project_id: 'gitlabhq')
+  end
+
+  it "to #tree" do
+    get("/gitlabhq/stable/tree").should             route_to('refs#tree', project_id: 'gitlabhq', id: 'stable')
+    get("/gitlabhq/stable/tree/foo/bar/baz").should route_to('refs#tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
+  end
+
+  it "to #logs_tree" do
+    get("/gitlabhq/stable/logs_tree").should             route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
+    get("/gitlabhq/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
+  end
+
+  it "to #blob" do
+    get("/gitlabhq/stable/blob").should route_to('refs#blob', project_id: 'gitlabhq', id: 'stable')
+  end
+
+  it "to #blame" do
+    get("/gitlabhq/stable/blame/foo/bar/baz").should route_to('refs#blame', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
+  end
+end
+
+#           diffs_project_merge_request GET    /:project_id/merge_requests/:id/diffs(.:format)           merge_requests#diffs
+#       automerge_project_merge_request GET    /:project_id/merge_requests/:id/automerge(.:format)       merge_requests#automerge
+# automerge_check_project_merge_request GET    /:project_id/merge_requests/:id/automerge_check(.:format) merge_requests#automerge_check
+#             raw_project_merge_request GET    /:project_id/merge_requests/:id/raw(.:format)             merge_requests#raw
+#    branch_from_project_merge_requests GET    /:project_id/merge_requests/branch_from(.:format)         merge_requests#branch_from
+#      branch_to_project_merge_requests GET    /:project_id/merge_requests/branch_to(.:format)           merge_requests#branch_to
+#                project_merge_requests GET    /:project_id/merge_requests(.:format)                     merge_requests#index
+#                                       POST   /:project_id/merge_requests(.:format)                     merge_requests#create
+#             new_project_merge_request GET    /:project_id/merge_requests/new(.:format)                 merge_requests#new
+#            edit_project_merge_request GET    /:project_id/merge_requests/:id/edit(.:format)            merge_requests#edit
+#                 project_merge_request GET    /:project_id/merge_requests/:id(.:format)                 merge_requests#show
+#                                       PUT    /:project_id/merge_requests/:id(.:format)                 merge_requests#update
+#                                       DELETE /:project_id/merge_requests/:id(.:format)                 merge_requests#destroy
+describe MergeRequestsController, "routing" do
+  it "to #diffs" do
+    get("/gitlabhq/merge_requests/1/diffs").should route_to('merge_requests#diffs', project_id: 'gitlabhq', id: '1')
+  end
+
+  it "to #automerge" do
+    get("/gitlabhq/merge_requests/1/automerge").should route_to('merge_requests#automerge', project_id: 'gitlabhq', id: '1')
+  end
+
+  it "to #automerge_check" do
+    get("/gitlabhq/merge_requests/1/automerge_check").should route_to('merge_requests#automerge_check', project_id: 'gitlabhq', id: '1')
+  end
+
+  it "to #raw" do
+    get("/gitlabhq/merge_requests/1/raw").should route_to('merge_requests#raw', project_id: 'gitlabhq', id: '1')
+  end
+
+  it "to #branch_from" do
+    get("/gitlabhq/merge_requests/branch_from").should route_to('merge_requests#branch_from', project_id: 'gitlabhq')
+  end
+
+  it "to #branch_to" do
+    get("/gitlabhq/merge_requests/branch_to").should route_to('merge_requests#branch_to', project_id: 'gitlabhq')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'merge_requests' }
+  end
+end
+
+#  raw_project_snippet GET    /:project_id/snippets/:id/raw(.:format)  snippets#raw
+#     project_snippets GET    /:project_id/snippets(.:format)          snippets#index
+#                      POST   /:project_id/snippets(.:format)          snippets#create
+#  new_project_snippet GET    /:project_id/snippets/new(.:format)      snippets#new
+# edit_project_snippet GET    /:project_id/snippets/:id/edit(.:format) snippets#edit
+#      project_snippet GET    /:project_id/snippets/:id(.:format)      snippets#show
+#                      PUT    /:project_id/snippets/:id(.:format)      snippets#update
+#                      DELETE /:project_id/snippets/:id(.:format)      snippets#destroy
+describe SnippetsController, "routing" do
+  it "to #raw" do
+    get("/gitlabhq/snippets/1/raw").should route_to('snippets#raw', project_id: 'gitlabhq', id: '1')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'snippets' }
+  end
+end
+
+# test_project_hook GET    /:project_id/hooks/:id/test(.:format) hooks#test
+#     project_hooks GET    /:project_id/hooks(.:format)          hooks#index
+#                   POST   /:project_id/hooks(.:format)          hooks#create
+#      project_hook DELETE /:project_id/hooks/:id(.:format)      hooks#destroy
+describe HooksController, "routing" do
+  it "to #test" do
+    get("/gitlabhq/hooks/1/test").should route_to('hooks#test', project_id: 'gitlabhq', id: '1')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:actions)    { [:index, :create, :destroy] }
+    let(:controller) { 'hooks' }
+  end
+end
+
+# compare_project_commits GET    /:project_id/commits/compare(.:format)   commits#compare
+#    patch_project_commit GET    /:project_id/commits/:id/patch(.:format) commits#patch
+#         project_commits GET    /:project_id/commits(.:format)           commits#index
+#                         POST   /:project_id/commits(.:format)           commits#create
+#      new_project_commit GET    /:project_id/commits/new(.:format)       commits#new
+#     edit_project_commit GET    /:project_id/commits/:id/edit(.:format)  commits#edit
+#          project_commit GET    /:project_id/commits/:id(.:format)       commits#show
+#                         PUT    /:project_id/commits/:id(.:format)       commits#update
+#                         DELETE /:project_id/commits/:id(.:format)       commits#destroy
+describe CommitsController, "routing" do
+  it "to #compare" do
+    get("/gitlabhq/commits/compare").should route_to('commits#compare', project_id: 'gitlabhq')
+  end
+
+  it "to #patch" do
+    get("/gitlabhq/commits/1/patch").should route_to('commits#patch', project_id: 'gitlabhq', id: '1')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'commits' }
+  end
+end
+
+#     project_team_members GET    /:project_id/team_members(.:format)          team_members#index
+#                          POST   /:project_id/team_members(.:format)          team_members#create
+#  new_project_team_member GET    /:project_id/team_members/new(.:format)      team_members#new
+# edit_project_team_member GET    /:project_id/team_members/:id/edit(.:format) team_members#edit
+#      project_team_member GET    /:project_id/team_members/:id(.:format)      team_members#show
+#                          PUT    /:project_id/team_members/:id(.:format)      team_members#update
+#                          DELETE /:project_id/team_members/:id(.:format)      team_members#destroy
+describe TeamMembersController, "routing" do
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'team_members' }
+  end
+end
+
+#     project_milestones GET    /:project_id/milestones(.:format)          milestones#index
+#                        POST   /:project_id/milestones(.:format)          milestones#create
+#  new_project_milestone GET    /:project_id/milestones/new(.:format)      milestones#new
+# edit_project_milestone GET    /:project_id/milestones/:id/edit(.:format) milestones#edit
+#      project_milestone GET    /:project_id/milestones/:id(.:format)      milestones#show
+#                        PUT    /:project_id/milestones/:id(.:format)      milestones#update
+#                        DELETE /:project_id/milestones/:id(.:format)      milestones#destroy
+describe MilestonesController, "routing" do
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'milestones' }
+  end
+end
+
+# project_labels GET    /:project_id/labels(.:format) labels#index
+describe LabelsController, "routing" do
+  it "to #index" do
+    get("/gitlabhq/labels").should route_to('labels#index', project_id: 'gitlabhq')
+  end
+end
+
+#        sort_project_issues POST   /:project_id/issues/sort(.:format)        issues#sort
+# bulk_update_project_issues POST   /:project_id/issues/bulk_update(.:format) issues#bulk_update
+#      search_project_issues GET    /:project_id/issues/search(.:format)      issues#search
+#             project_issues GET    /:project_id/issues(.:format)             issues#index
+#                            POST   /:project_id/issues(.:format)             issues#create
+#          new_project_issue GET    /:project_id/issues/new(.:format)         issues#new
+#         edit_project_issue GET    /:project_id/issues/:id/edit(.:format)    issues#edit
+#              project_issue GET    /:project_id/issues/:id(.:format)         issues#show
+#                            PUT    /:project_id/issues/:id(.:format)         issues#update
+#                            DELETE /:project_id/issues/:id(.:format)         issues#destroy
+describe IssuesController, "routing" do
+  it "to #sort" do
+    post("/gitlabhq/issues/sort").should route_to('issues#sort', project_id: 'gitlabhq')
+  end
+
+  it "to #bulk_update" do
+    post("/gitlabhq/issues/bulk_update").should route_to('issues#bulk_update', project_id: 'gitlabhq')
+  end
+
+  it "to #search" do
+    get("/gitlabhq/issues/search").should route_to('issues#search', project_id: 'gitlabhq')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'issues' }
+  end
+end
+
+# preview_project_notes POST   /:project_id/notes/preview(.:format) notes#preview
+#         project_notes GET    /:project_id/notes(.:format)         notes#index
+#                       POST   /:project_id/notes(.:format)         notes#create
+#          project_note DELETE /:project_id/notes/:id(.:format)     notes#destroy
+describe NotesController, "routing" do
+  it "to #preview" do
+    post("/gitlabhq/notes/preview").should route_to('notes#preview', project_id: 'gitlabhq')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:actions)    { [:index, :create, :destroy] }
+    let(:controller) { 'notes' }
+  end
+end

From 925183ed7a8eb392e008764483f59c319e22a59c Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 07:44:54 -0400
Subject: [PATCH 06/12] Add an AdminController base class for Admin controllers

Handles stuff that's shared across admin controllers.
---
 app/controllers/admin/dashboard_controller.rb    |  6 +-----
 app/controllers/admin/hooks_controller.rb        |  8 ++------
 app/controllers/admin/logs_controller.rb         |  6 +-----
 app/controllers/admin/projects_controller.rb     |  9 +++------
 app/controllers/admin/resque_controller.rb       |  5 ++---
 app/controllers/admin/team_members_controller.rb |  6 +-----
 app/controllers/admin/users_controller.rb        | 16 ++++++----------
 app/controllers/admin_controller.rb              | 11 +++++++++++
 app/controllers/application_controller.rb        |  4 ----
 9 files changed, 27 insertions(+), 44 deletions(-)
 create mode 100644 app/controllers/admin_controller.rb

diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index ad80f4d5..5152f6fa 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -1,8 +1,4 @@
-class Admin::DashboardController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
+class Admin::DashboardController < AdminController
   def index
     @workers = Resque.workers
     @pending_jobs = Resque.size(:post_receive)
diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb
index 7f832fd5..91a1d633 100644
--- a/app/controllers/admin/hooks_controller.rb
+++ b/app/controllers/admin/hooks_controller.rb
@@ -1,8 +1,4 @@
-class Admin::HooksController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-  
+class Admin::HooksController < AdminController
   def index
     @hooks = SystemHook.all
     @hook = SystemHook.new
@@ -15,7 +11,7 @@ class Admin::HooksController < ApplicationController
       redirect_to admin_hooks_path, notice: 'Hook was successfully created.'
     else
       @hooks = SystemHook.all
-      render :index 
+      render :index
     end
   end
 
diff --git a/app/controllers/admin/logs_controller.rb b/app/controllers/admin/logs_controller.rb
index c130b4b8..28c321a9 100644
--- a/app/controllers/admin/logs_controller.rb
+++ b/app/controllers/admin/logs_controller.rb
@@ -1,6 +1,2 @@
-class Admin::LogsController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
+class Admin::LogsController < AdminController
 end
-
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 80d11f03..24406525 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -1,7 +1,4 @@
-class Admin::ProjectsController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
+class Admin::ProjectsController < AdminController
   before_filter :admin_project, only: [:edit, :show, :update, :destroy, :team_update]
 
   def index
@@ -43,7 +40,7 @@ class Admin::ProjectsController < ApplicationController
   def update
     owner_id = params[:project].delete(:owner_id)
 
-    if owner_id 
+    if owner_id
       @admin_project.owner = User.find(owner_id)
     end
 
@@ -60,7 +57,7 @@ class Admin::ProjectsController < ApplicationController
     redirect_to admin_projects_url, notice: 'Project was successfully deleted.'
   end
 
-  private 
+  private
 
   def admin_project
     @admin_project = Project.find_by_code(params[:id])
diff --git a/app/controllers/admin/resque_controller.rb b/app/controllers/admin/resque_controller.rb
index dc575cc2..9d8e7e30 100644
--- a/app/controllers/admin/resque_controller.rb
+++ b/app/controllers/admin/resque_controller.rb
@@ -1,5 +1,4 @@
-class Admin::ResqueController < ApplicationController
-  layout 'admin'
+class Admin::ResqueController < AdminController
   def show
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/admin/team_members_controller.rb b/app/controllers/admin/team_members_controller.rb
index 57803b01..07320805 100644
--- a/app/controllers/admin/team_members_controller.rb
+++ b/app/controllers/admin/team_members_controller.rb
@@ -1,8 +1,4 @@
-class Admin::TeamMembersController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
+class Admin::TeamMembersController < AdminController
   def edit
     @admin_team_member = UsersProject.find(params[:id])
   end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 1e8f420b..e2d61864 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,8 +1,4 @@
-class Admin::UsersController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
+class Admin::UsersController < AdminController
   def index
     @admin_users = User.scoped
     @admin_users = @admin_users.filter(params[:filter])
@@ -24,7 +20,7 @@ class Admin::UsersController < ApplicationController
     @admin_user = User.find(params[:id])
 
     UsersProject.user_bulk_import(
-      @admin_user, 
+      @admin_user,
       params[:project_ids],
       params[:project_access]
     )
@@ -41,22 +37,22 @@ class Admin::UsersController < ApplicationController
     @admin_user = User.find(params[:id])
   end
 
-  def block 
+  def block
     @admin_user = User.find(params[:id])
 
     if @admin_user.block
       redirect_to :back, alert: "Successfully blocked"
-    else 
+    else
       redirect_to :back, alert: "Error occured. User was not blocked"
     end
   end
 
-  def unblock 
+  def unblock
     @admin_user = User.find(params[:id])
 
     if @admin_user.update_attribute(:blocked, false)
       redirect_to :back, alert: "Successfully unblocked"
-    else 
+    else
       redirect_to :back, alert: "Error occured. User was not unblocked"
     end
   end
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
new file mode 100644
index 00000000..bce9f692
--- /dev/null
+++ b/app/controllers/admin_controller.rb
@@ -0,0 +1,11 @@
+# Provides a base class for Admin controllers to subclass
+#
+# Automatically sets the layout and ensures an administrator is logged in
+class AdminController < ApplicationController
+  layout 'admin'
+  before_filter :authenticate_admin!
+
+  def authenticate_admin!
+    return render_404 unless current_user.is_admin?
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a0040298..5ac5c639 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -84,10 +84,6 @@ class ApplicationController < ActionController::Base
     abilities << Ability
   end
 
-  def authenticate_admin!
-    return render_404 unless current_user.is_admin?
-  end
-
   def authorize_project!(action)
     return access_denied! unless can?(current_user, action, project)
   end

From a0893b4d58a6162743b325efe0f93b1b957e8a0a Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 10 Aug 2012 18:44:36 -0400
Subject: [PATCH 07/12] Remove non-existent "close" action from
 authorize_modify_issue filter

---
 app/controllers/issues_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 3d305238..9be37ca1 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -17,7 +17,7 @@ class IssuesController < ApplicationController
   before_filter :authorize_write_issue!, only: [:new, :create]
 
   # Allow modify issue
-  before_filter :authorize_modify_issue!, only: [:close, :edit, :update]
+  before_filter :authorize_modify_issue!, only: [:edit, :update]
 
   # Allow destroy issue
   before_filter :authorize_admin_issue!, only: [:destroy]

From 8cfb197dfcad3aa0c11f7afd34e4c7bfef953d1d Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 10 Aug 2012 18:51:07 -0400
Subject: [PATCH 08/12] Remove redundant access check for Issues#destroy

We were already calling `authorize_admin_issue!` in a before filter with
the same permission checks, so this deleted check wasn't actually doing
anything.
---
 app/controllers/issues_controller.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 9be37ca1..1d78a6d9 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -87,8 +87,6 @@ class IssuesController < ApplicationController
   end
 
   def destroy
-    return access_denied! unless can?(current_user, :admin_issue, @issue)
-
     @issue.destroy
 
     respond_to do |format|

From 95bd93fe1aad3efbe2c8cc7b255a98ddb27d2d35 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 09:21:20 -0400
Subject: [PATCH 09/12] Remove Projects#team action

Uses TeamMembers#index instead, to be more RESTful
---
 app/controllers/team_members_controller.rb                  | 6 +++---
 app/helpers/application_helper.rb                           | 2 +-
 app/helpers/tab_helper.rb                                   | 2 +-
 app/views/projects/_project_head.html.haml                  | 4 ++--
 app/views/team_members/_form.html.haml                      | 2 +-
 app/views/{projects => team_members}/_team.html.haml        | 0
 .../team.html.haml => team_members/index.html.haml}         | 6 ++----
 app/views/team_members/show.html.haml                       | 2 +-
 config/routes.rb                                            | 2 +-
 features/steps/shared/paths.rb                              | 2 +-
 spec/routing/routing_spec.rb                                | 5 -----
 11 files changed, 13 insertions(+), 20 deletions(-)
 rename app/views/{projects => team_members}/_team.html.haml (100%)
 rename app/views/{projects/team.html.haml => team_members/index.html.haml} (79%)

diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb
index 606cb972..27f40b5a 100644
--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
@@ -22,7 +22,7 @@ class TeamMembersController < ApplicationController
       params[:project_access]
     )
 
-    redirect_to team_project_path(@project)
+    redirect_to project_team_index_path(@project)
   end
 
   def update
@@ -32,7 +32,7 @@ class TeamMembersController < ApplicationController
     unless @team_member.valid?
       flash[:alert] = "User should have at least one role"
     end
-    redirect_to team_project_path(@project)
+    redirect_to project_team_index_path(@project)
   end
 
   def destroy
@@ -40,7 +40,7 @@ class TeamMembersController < ApplicationController
     @team_member.destroy
 
     respond_to do |format|
-      format.html { redirect_to team_project_path(@project) }
+      format.html { redirect_to project_team_index_path(@project) }
       format.js { render nothing: true }
     end
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3e435840..0938dc23 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -62,7 +62,7 @@ module ApplicationHelper
         { label: "#{@project.name} / Wall", url: wall_project_path(@project) },
         { label: "#{@project.name} / Tree", url: tree_project_ref_path(@project, @project.root_ref) },
         { label: "#{@project.name} / Commits", url: project_commits_path(@project) },
-        { label: "#{@project.name} / Team", url: team_project_path(@project) }
+        { label: "#{@project.name} / Team", url: project_team_index_path(@project) }
       ]
     end
 
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 1740864b..b5d7ccb7 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -8,7 +8,7 @@ module TabHelper
   end
 
   def project_tab_class
-    [:show, :files, :team, :edit, :update].each do |action|
+    [:show, :files, :edit, :update].each do |action|
       return "current" if current_page?(controller: "projects", action: action, id: @project)
     end
 
diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml
index ba64ee7f..4f38bef8 100644
--- a/app/views/projects/_project_head.html.haml
+++ b/app/views/projects/_project_head.html.haml
@@ -3,8 +3,8 @@
     = link_to project_path(@project), class: "activities-tab tab" do
       %i.icon-home
       Show
-  %li{ class: " #{'active' if (controller.controller_name == "team_members") || current_page?(team_project_path(@project)) }" }
-    = link_to team_project_path(@project), class: "team-tab tab" do
+  %li{ class: " #{'active' if (controller.controller_name == "team_members") || current_page?(project_team_index_path(@project)) }" }
+    = link_to project_team_index_path(@project), class: "team-tab tab" do
       %i.icon-user
       Team
   %li{ class: "#{'active' if current_page?(files_project_path(@project)) }" }
diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml
index 3736bfea..92167138 100644
--- a/app/views/team_members/_form.html.haml
+++ b/app/views/team_members/_form.html.haml
@@ -20,4 +20,4 @@
 
   .actions
     = f.submit 'Save', class: "btn save-btn"
-    = link_to "Cancel", team_project_path(@project), class: "btn cancel-btn"
+    = link_to "Cancel", project_team_index_path(@project), class: "btn cancel-btn"
diff --git a/app/views/projects/_team.html.haml b/app/views/team_members/_team.html.haml
similarity index 100%
rename from app/views/projects/_team.html.haml
rename to app/views/team_members/_team.html.haml
diff --git a/app/views/projects/team.html.haml b/app/views/team_members/index.html.haml
similarity index 79%
rename from app/views/projects/team.html.haml
rename to app/views/team_members/index.html.haml
index e8a825c7..b3b7b72a 100644
--- a/app/views/projects/team.html.haml
+++ b/app/views/team_members/index.html.haml
@@ -1,4 +1,4 @@
-= render "project_head"
+= render "projects/project_head"
 %h3.page_title
   Team Members
   %small (#{@project.users_projects.count})
@@ -10,6 +10,4 @@
     Read more about project permissions
     %strong= link_to "here", help_permissions_path, class: "vlink"
 
-
-= render partial: "team", locals: {project: @project}
-
+= render partial: "team_members/team", locals: {project: @project}
diff --git a/app/views/team_members/show.html.haml b/app/views/team_members/show.html.haml
index 3b5c78a8..9d03cd2c 100644
--- a/app/views/team_members/show.html.haml
+++ b/app/views/team_members/show.html.haml
@@ -14,7 +14,7 @@
   %hr
   .back_link
     %br
-    = link_to team_project_path(@project), class: "" do
+    = link_to project_team_index_path(@project), class: "" do
       &larr; To team list
   %br
   .row
diff --git a/config/routes.rb b/config/routes.rb
index c226a473..cfb9bdb9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -90,7 +90,6 @@ Gitlab::Application.routes.draw do
   #
   resources :projects, constraints: { id: /[^\/]+/ }, except: [:new, :create, :index], path: "/" do
     member do
-      get "team"
       get "wall"
       get "graph"
       get "files"
@@ -192,6 +191,7 @@ Gitlab::Application.routes.draw do
         get :patch
       end
     end
+    resources :team, controller: 'team_members', only: [:index]
     resources :team_members
     resources :milestones
     resources :labels, only: [:index]
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index b0028f9c..93ad0219 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -98,7 +98,7 @@ module SharedPaths
   end
 
   Then 'I visit project "Shop" team page' do
-    visit team_project_path(Project.find_by_name("Shop"))
+    visit project_team_index_path(Project.find_by_name("Shop"))
   end
 
   Then 'I visit project "Shop" wall page' do
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index f69422ba..c93fb58a 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -227,7 +227,6 @@ end
 
 #      projects POST   /projects(.:format)     projects#create
 #   new_project GET    /projects/new(.:format) projects#new
-#  team_project GET    /:id/team(.:format)     projects#team
 #  wall_project GET    /:id/wall(.:format)     projects#wall
 # graph_project GET    /:id/graph(.:format)    projects#graph
 # files_project GET    /:id/files(.:format)    projects#files
@@ -244,10 +243,6 @@ describe ProjectsController, "routing" do
     get("/projects/new").should route_to('projects#new')
   end
 
-  it "to #team" do
-    get("/gitlabhq/team").should route_to('projects#team', id: 'gitlabhq')
-  end
-
   it "to #wall" do
     get("/gitlabhq/wall").should route_to('projects#wall', id: 'gitlabhq')
   end

From 02b24cefc7d48c1a4adb4a3fcd430770022db7b1 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 10:38:01 -0400
Subject: [PATCH 10/12] Missed a use of team_project_path

---
 spec/requests/security/project_access_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/security/project_access_spec.rb b/spec/requests/security/project_access_spec.rb
index 0cdf43bf..af0d5fcd 100644
--- a/spec/requests/security/project_access_spec.rb
+++ b/spec/requests/security/project_access_spec.rb
@@ -70,7 +70,7 @@ describe "Application access" do
     end
 
     describe "GET /project_code/team" do
-      subject { team_project_path(@project) }
+      subject { project_team_index_path(@project) }
 
       it { should be_allowed_for @u1 }
       it { should be_allowed_for @u3 }

From b24346fa2b246d71b2918e9d3ac3049f7663fb86 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 10:56:32 -0400
Subject: [PATCH 11/12] Fix permissions for TeamMembers#index

---
 app/controllers/team_members_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb
index 27f40b5a..a50dcd3e 100644
--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
@@ -5,7 +5,10 @@ class TeamMembersController < ApplicationController
   # Authorize
   before_filter :add_project_abilities
   before_filter :authorize_read_project!
-  before_filter :authorize_admin_project!, except: [:show]
+  before_filter :authorize_admin_project!, except: [:index, :show]
+
+  def index
+  end
 
   def show
     @team_member = project.users_projects.find(params[:id])

From f4b14494ef6abf3d144c28e4af0c20143383e062 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 16 Sep 2012 12:42:52 -0400
Subject: [PATCH 12/12] Move project-related routing specs to their own file

---
 spec/routing/project_routing_spec.rb | 398 +++++++++++++++++++++++++++
 spec/routing/routing_spec.rb         | 397 --------------------------
 2 files changed, 398 insertions(+), 397 deletions(-)
 create mode 100644 spec/routing/project_routing_spec.rb

diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
new file mode 100644
index 00000000..b3f9db01
--- /dev/null
+++ b/spec/routing/project_routing_spec.rb
@@ -0,0 +1,398 @@
+require 'spec_helper'
+
+# Shared examples for a resource inside a Project
+#
+# By default it tests all the default REST actions: index, create, new, edit,
+# show, update, and destroy. You can remove actions by customizing the
+# `actions` variable.
+#
+# It also expects a `controller` variable to be available which defines both
+# the path to the resource as well as the controller name.
+#
+# Examples
+#
+#   # Default behavior
+#   it_behaves_like "RESTful project resources" do
+#     let(:controller) { 'issues' }
+#   end
+#
+#   # Customizing actions
+#   it_behaves_like "RESTful project resources" do
+#     let(:actions)    { [:index] }
+#     let(:controller) { 'issues' }
+#   end
+shared_examples "RESTful project resources" do
+  let(:actions) { [:index, :create, :new, :edit, :show, :update, :destroy] }
+
+  it "to #index" do
+    get("/gitlabhq/#{controller}").should route_to("#{controller}#index", project_id: 'gitlabhq') if actions.include?(:index)
+  end
+
+  it "to #create" do
+    post("/gitlabhq/#{controller}").should route_to("#{controller}#create", project_id: 'gitlabhq') if actions.include?(:create)
+  end
+
+  it "to #new" do
+    get("/gitlabhq/#{controller}/new").should route_to("#{controller}#new", project_id: 'gitlabhq') if actions.include?(:new)
+  end
+
+  it "to #edit" do
+    get("/gitlabhq/#{controller}/1/edit").should route_to("#{controller}#edit", project_id: 'gitlabhq', id: '1') if actions.include?(:edit)
+  end
+
+  it "to #show" do
+    get("/gitlabhq/#{controller}/1").should route_to("#{controller}#show", project_id: 'gitlabhq', id: '1') if actions.include?(:show)
+  end
+
+  it "to #update" do
+    put("/gitlabhq/#{controller}/1").should route_to("#{controller}#update", project_id: 'gitlabhq', id: '1') if actions.include?(:update)
+  end
+
+  it "to #destroy" do
+    delete("/gitlabhq/#{controller}/1").should route_to("#{controller}#destroy", project_id: 'gitlabhq', id: '1') if actions.include?(:destroy)
+  end
+end
+
+#      projects POST   /projects(.:format)     projects#create
+#   new_project GET    /projects/new(.:format) projects#new
+#  wall_project GET    /:id/wall(.:format)     projects#wall
+# graph_project GET    /:id/graph(.:format)    projects#graph
+# files_project GET    /:id/files(.:format)    projects#files
+#  edit_project GET    /:id/edit(.:format)     projects#edit
+#       project GET    /:id(.:format)          projects#show
+#               PUT    /:id(.:format)          projects#update
+#               DELETE /:id(.:format)          projects#destroy
+describe ProjectsController, "routing" do
+  it "to #create" do
+    post("/projects").should route_to('projects#create')
+  end
+
+  it "to #new" do
+    get("/projects/new").should route_to('projects#new')
+  end
+
+  it "to #wall" do
+    get("/gitlabhq/wall").should route_to('projects#wall', id: 'gitlabhq')
+  end
+
+  it "to #graph" do
+    get("/gitlabhq/graph").should route_to('projects#graph', id: 'gitlabhq')
+  end
+
+  it "to #files" do
+    get("/gitlabhq/files").should route_to('projects#files', id: 'gitlabhq')
+  end
+
+  it "to #edit" do
+    get("/gitlabhq/edit").should route_to('projects#edit', id: 'gitlabhq')
+  end
+
+  it "to #show" do
+    get("/gitlabhq").should route_to('projects#show', id: 'gitlabhq')
+  end
+
+  it "to #update" do
+    put("/gitlabhq").should route_to('projects#update', id: 'gitlabhq')
+  end
+
+  it "to #destroy" do
+    delete("/gitlabhq").should route_to('projects#destroy', id: 'gitlabhq')
+  end
+end
+
+#  pages_project_wikis GET    /:project_id/wikis/pages(.:format)       wikis#pages
+# history_project_wiki GET    /:project_id/wikis/:id/history(.:format) wikis#history
+#        project_wikis POST   /:project_id/wikis(.:format)             wikis#create
+#    edit_project_wiki GET    /:project_id/wikis/:id/edit(.:format)    wikis#edit
+#         project_wiki GET    /:project_id/wikis/:id(.:format)         wikis#show
+#                      DELETE /:project_id/wikis/:id(.:format)         wikis#destroy
+describe WikisController, "routing" do
+  it "to #pages" do
+    get("/gitlabhq/wikis/pages").should route_to('wikis#pages', project_id: 'gitlabhq')
+  end
+
+  it "to #history" do
+    get("/gitlabhq/wikis/1/history").should route_to('wikis#history', project_id: 'gitlabhq', id: '1')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:actions)    { [:create, :edit, :show, :destroy] }
+    let(:controller) { 'wikis' }
+  end
+end
+
+# branches_project_repository GET    /:project_id/repository/branches(.:format) repositories#branches
+#     tags_project_repository GET    /:project_id/repository/tags(.:format)     repositories#tags
+#  archive_project_repository GET    /:project_id/repository/archive(.:format)  repositories#archive
+#          project_repository POST   /:project_id/repository(.:format)          repositories#create
+#      new_project_repository GET    /:project_id/repository/new(.:format)      repositories#new
+#     edit_project_repository GET    /:project_id/repository/edit(.:format)     repositories#edit
+#                             GET    /:project_id/repository(.:format)          repositories#show
+#                             PUT    /:project_id/repository(.:format)          repositories#update
+#                             DELETE /:project_id/repository(.:format)          repositories#destroy
+describe RepositoriesController, "routing" do
+  it "to #branches" do
+    get("/gitlabhq/repository/branches").should route_to('repositories#branches', project_id: 'gitlabhq')
+  end
+
+  it "to #tags" do
+    get("/gitlabhq/repository/tags").should route_to('repositories#tags', project_id: 'gitlabhq')
+  end
+
+  it "to #archive" do
+    get("/gitlabhq/repository/archive").should route_to('repositories#archive', project_id: 'gitlabhq')
+  end
+
+  it "to #create" do
+    post("/gitlabhq/repository").should route_to('repositories#create', project_id: 'gitlabhq')
+  end
+
+  it "to #new" do
+    get("/gitlabhq/repository/new").should route_to('repositories#new', project_id: 'gitlabhq')
+  end
+
+  it "to #edit" do
+    get("/gitlabhq/repository/edit").should route_to('repositories#edit', project_id: 'gitlabhq')
+  end
+
+  it "to #show" do
+    get("/gitlabhq/repository").should route_to('repositories#show', project_id: 'gitlabhq')
+  end
+
+  it "to #update" do
+    put("/gitlabhq/repository").should route_to('repositories#update', project_id: 'gitlabhq')
+  end
+
+  it "to #destroy" do
+    delete("/gitlabhq/repository").should route_to('repositories#destroy', project_id: 'gitlabhq')
+  end
+end
+
+#     project_deploy_keys GET    /:project_id/deploy_keys(.:format)          deploy_keys#index
+#                         POST   /:project_id/deploy_keys(.:format)          deploy_keys#create
+#  new_project_deploy_key GET    /:project_id/deploy_keys/new(.:format)      deploy_keys#new
+# edit_project_deploy_key GET    /:project_id/deploy_keys/:id/edit(.:format) deploy_keys#edit
+#      project_deploy_key GET    /:project_id/deploy_keys/:id(.:format)      deploy_keys#show
+#                         PUT    /:project_id/deploy_keys/:id(.:format)      deploy_keys#update
+#                         DELETE /:project_id/deploy_keys/:id(.:format)      deploy_keys#destroy
+describe DeployKeysController, "routing" do
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'deploy_keys' }
+  end
+end
+
+# project_protected_branches GET    /:project_id/protected_branches(.:format)     protected_branches#index
+#                            POST   /:project_id/protected_branches(.:format)     protected_branches#create
+#   project_protected_branch DELETE /:project_id/protected_branches/:id(.:format) protected_branches#destroy
+describe ProtectedBranchesController, "routing" do
+  it_behaves_like "RESTful project resources" do
+    let(:actions)    { [:index, :create, :destroy] }
+    let(:controller) { 'protected_branches' }
+  end
+end
+
+#    switch_project_refs GET    /:project_id/switch(.:format)              refs#switch
+#       tree_project_ref GET    /:project_id/:id/tree(.:format)            refs#tree
+#  logs_tree_project_ref GET    /:project_id/:id/logs_tree(.:format)       refs#logs_tree
+#       blob_project_ref GET    /:project_id/:id/blob(.:format)            refs#blob
+#  tree_file_project_ref GET    /:project_id/:id/tree/:path(.:format)      refs#tree
+#  logs_file_project_ref GET    /:project_id/:id/logs_tree/:path(.:format) refs#logs_tree
+# blame_file_project_ref GET    /:project_id/:id/blame/:path(.:format)     refs#blame
+describe RefsController, "routing" do
+  it "to #switch" do
+    get("/gitlabhq/switch").should route_to('refs#switch', project_id: 'gitlabhq')
+  end
+
+  it "to #tree" do
+    get("/gitlabhq/stable/tree").should             route_to('refs#tree', project_id: 'gitlabhq', id: 'stable')
+    get("/gitlabhq/stable/tree/foo/bar/baz").should route_to('refs#tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
+  end
+
+  it "to #logs_tree" do
+    get("/gitlabhq/stable/logs_tree").should             route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
+    get("/gitlabhq/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
+  end
+
+  it "to #blob" do
+    get("/gitlabhq/stable/blob").should route_to('refs#blob', project_id: 'gitlabhq', id: 'stable')
+  end
+
+  it "to #blame" do
+    get("/gitlabhq/stable/blame/foo/bar/baz").should route_to('refs#blame', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
+  end
+end
+
+#           diffs_project_merge_request GET    /:project_id/merge_requests/:id/diffs(.:format)           merge_requests#diffs
+#       automerge_project_merge_request GET    /:project_id/merge_requests/:id/automerge(.:format)       merge_requests#automerge
+# automerge_check_project_merge_request GET    /:project_id/merge_requests/:id/automerge_check(.:format) merge_requests#automerge_check
+#             raw_project_merge_request GET    /:project_id/merge_requests/:id/raw(.:format)             merge_requests#raw
+#    branch_from_project_merge_requests GET    /:project_id/merge_requests/branch_from(.:format)         merge_requests#branch_from
+#      branch_to_project_merge_requests GET    /:project_id/merge_requests/branch_to(.:format)           merge_requests#branch_to
+#                project_merge_requests GET    /:project_id/merge_requests(.:format)                     merge_requests#index
+#                                       POST   /:project_id/merge_requests(.:format)                     merge_requests#create
+#             new_project_merge_request GET    /:project_id/merge_requests/new(.:format)                 merge_requests#new
+#            edit_project_merge_request GET    /:project_id/merge_requests/:id/edit(.:format)            merge_requests#edit
+#                 project_merge_request GET    /:project_id/merge_requests/:id(.:format)                 merge_requests#show
+#                                       PUT    /:project_id/merge_requests/:id(.:format)                 merge_requests#update
+#                                       DELETE /:project_id/merge_requests/:id(.:format)                 merge_requests#destroy
+describe MergeRequestsController, "routing" do
+  it "to #diffs" do
+    get("/gitlabhq/merge_requests/1/diffs").should route_to('merge_requests#diffs', project_id: 'gitlabhq', id: '1')
+  end
+
+  it "to #automerge" do
+    get("/gitlabhq/merge_requests/1/automerge").should route_to('merge_requests#automerge', project_id: 'gitlabhq', id: '1')
+  end
+
+  it "to #automerge_check" do
+    get("/gitlabhq/merge_requests/1/automerge_check").should route_to('merge_requests#automerge_check', project_id: 'gitlabhq', id: '1')
+  end
+
+  it "to #raw" do
+    get("/gitlabhq/merge_requests/1/raw").should route_to('merge_requests#raw', project_id: 'gitlabhq', id: '1')
+  end
+
+  it "to #branch_from" do
+    get("/gitlabhq/merge_requests/branch_from").should route_to('merge_requests#branch_from', project_id: 'gitlabhq')
+  end
+
+  it "to #branch_to" do
+    get("/gitlabhq/merge_requests/branch_to").should route_to('merge_requests#branch_to', project_id: 'gitlabhq')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'merge_requests' }
+  end
+end
+
+#  raw_project_snippet GET    /:project_id/snippets/:id/raw(.:format)  snippets#raw
+#     project_snippets GET    /:project_id/snippets(.:format)          snippets#index
+#                      POST   /:project_id/snippets(.:format)          snippets#create
+#  new_project_snippet GET    /:project_id/snippets/new(.:format)      snippets#new
+# edit_project_snippet GET    /:project_id/snippets/:id/edit(.:format) snippets#edit
+#      project_snippet GET    /:project_id/snippets/:id(.:format)      snippets#show
+#                      PUT    /:project_id/snippets/:id(.:format)      snippets#update
+#                      DELETE /:project_id/snippets/:id(.:format)      snippets#destroy
+describe SnippetsController, "routing" do
+  it "to #raw" do
+    get("/gitlabhq/snippets/1/raw").should route_to('snippets#raw', project_id: 'gitlabhq', id: '1')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'snippets' }
+  end
+end
+
+# test_project_hook GET    /:project_id/hooks/:id/test(.:format) hooks#test
+#     project_hooks GET    /:project_id/hooks(.:format)          hooks#index
+#                   POST   /:project_id/hooks(.:format)          hooks#create
+#      project_hook DELETE /:project_id/hooks/:id(.:format)      hooks#destroy
+describe HooksController, "routing" do
+  it "to #test" do
+    get("/gitlabhq/hooks/1/test").should route_to('hooks#test', project_id: 'gitlabhq', id: '1')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:actions)    { [:index, :create, :destroy] }
+    let(:controller) { 'hooks' }
+  end
+end
+
+# compare_project_commits GET    /:project_id/commits/compare(.:format)   commits#compare
+#    patch_project_commit GET    /:project_id/commits/:id/patch(.:format) commits#patch
+#         project_commits GET    /:project_id/commits(.:format)           commits#index
+#                         POST   /:project_id/commits(.:format)           commits#create
+#      new_project_commit GET    /:project_id/commits/new(.:format)       commits#new
+#     edit_project_commit GET    /:project_id/commits/:id/edit(.:format)  commits#edit
+#          project_commit GET    /:project_id/commits/:id(.:format)       commits#show
+#                         PUT    /:project_id/commits/:id(.:format)       commits#update
+#                         DELETE /:project_id/commits/:id(.:format)       commits#destroy
+describe CommitsController, "routing" do
+  it "to #compare" do
+    get("/gitlabhq/commits/compare").should route_to('commits#compare', project_id: 'gitlabhq')
+  end
+
+  it "to #patch" do
+    get("/gitlabhq/commits/1/patch").should route_to('commits#patch', project_id: 'gitlabhq', id: '1')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'commits' }
+  end
+end
+
+#     project_team_members GET    /:project_id/team_members(.:format)          team_members#index
+#                          POST   /:project_id/team_members(.:format)          team_members#create
+#  new_project_team_member GET    /:project_id/team_members/new(.:format)      team_members#new
+# edit_project_team_member GET    /:project_id/team_members/:id/edit(.:format) team_members#edit
+#      project_team_member GET    /:project_id/team_members/:id(.:format)      team_members#show
+#                          PUT    /:project_id/team_members/:id(.:format)      team_members#update
+#                          DELETE /:project_id/team_members/:id(.:format)      team_members#destroy
+describe TeamMembersController, "routing" do
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'team_members' }
+  end
+end
+
+#     project_milestones GET    /:project_id/milestones(.:format)          milestones#index
+#                        POST   /:project_id/milestones(.:format)          milestones#create
+#  new_project_milestone GET    /:project_id/milestones/new(.:format)      milestones#new
+# edit_project_milestone GET    /:project_id/milestones/:id/edit(.:format) milestones#edit
+#      project_milestone GET    /:project_id/milestones/:id(.:format)      milestones#show
+#                        PUT    /:project_id/milestones/:id(.:format)      milestones#update
+#                        DELETE /:project_id/milestones/:id(.:format)      milestones#destroy
+describe MilestonesController, "routing" do
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'milestones' }
+  end
+end
+
+# project_labels GET    /:project_id/labels(.:format) labels#index
+describe LabelsController, "routing" do
+  it "to #index" do
+    get("/gitlabhq/labels").should route_to('labels#index', project_id: 'gitlabhq')
+  end
+end
+
+#        sort_project_issues POST   /:project_id/issues/sort(.:format)        issues#sort
+# bulk_update_project_issues POST   /:project_id/issues/bulk_update(.:format) issues#bulk_update
+#      search_project_issues GET    /:project_id/issues/search(.:format)      issues#search
+#             project_issues GET    /:project_id/issues(.:format)             issues#index
+#                            POST   /:project_id/issues(.:format)             issues#create
+#          new_project_issue GET    /:project_id/issues/new(.:format)         issues#new
+#         edit_project_issue GET    /:project_id/issues/:id/edit(.:format)    issues#edit
+#              project_issue GET    /:project_id/issues/:id(.:format)         issues#show
+#                            PUT    /:project_id/issues/:id(.:format)         issues#update
+#                            DELETE /:project_id/issues/:id(.:format)         issues#destroy
+describe IssuesController, "routing" do
+  it "to #sort" do
+    post("/gitlabhq/issues/sort").should route_to('issues#sort', project_id: 'gitlabhq')
+  end
+
+  it "to #bulk_update" do
+    post("/gitlabhq/issues/bulk_update").should route_to('issues#bulk_update', project_id: 'gitlabhq')
+  end
+
+  it "to #search" do
+    get("/gitlabhq/issues/search").should route_to('issues#search', project_id: 'gitlabhq')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:controller) { 'issues' }
+  end
+end
+
+# preview_project_notes POST   /:project_id/notes/preview(.:format) notes#preview
+#         project_notes GET    /:project_id/notes(.:format)         notes#index
+#                       POST   /:project_id/notes(.:format)         notes#create
+#          project_note DELETE /:project_id/notes/:id(.:format)     notes#destroy
+describe NotesController, "routing" do
+  it "to #preview" do
+    post("/gitlabhq/notes/preview").should route_to('notes#preview', project_id: 'gitlabhq')
+  end
+
+  it_behaves_like "RESTful project resources" do
+    let(:actions)    { [:index, :create, :destroy] }
+    let(:controller) { 'notes' }
+  end
+end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index c93fb58a..cb8dbf37 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -1,58 +1,5 @@
 require 'spec_helper'
 
-# Shared examples for a resource inside a Project
-#
-# By default it tests all the default REST actions: index, create, new, edit,
-# show, update, and destroy. You can remove actions by customizing the
-# `actions` variable.
-#
-# It also expects a `controller` variable to be available which defines both
-# the path to the resource as well as the controller name.
-#
-# Examples
-#
-#   # Default behavior
-#   it_behaves_like "RESTful project resources" do
-#     let(:controller) { 'issues' }
-#   end
-#
-#   # Customizing actions
-#   it_behaves_like "RESTful project resources" do
-#     let(:actions)    { [:index] }
-#     let(:controller) { 'issues' }
-#   end
-shared_examples "RESTful project resources" do
-  let(:actions) { [:index, :create, :new, :edit, :show, :update, :destroy] }
-
-  it "to #index" do
-    get("/gitlabhq/#{controller}").should route_to("#{controller}#index", project_id: 'gitlabhq') if actions.include?(:index)
-  end
-
-  it "to #create" do
-    post("/gitlabhq/#{controller}").should route_to("#{controller}#create", project_id: 'gitlabhq') if actions.include?(:create)
-  end
-
-  it "to #new" do
-    get("/gitlabhq/#{controller}/new").should route_to("#{controller}#new", project_id: 'gitlabhq') if actions.include?(:new)
-  end
-
-  it "to #edit" do
-    get("/gitlabhq/#{controller}/1/edit").should route_to("#{controller}#edit", project_id: 'gitlabhq', id: '1') if actions.include?(:edit)
-  end
-
-  it "to #show" do
-    get("/gitlabhq/#{controller}/1").should route_to("#{controller}#show", project_id: 'gitlabhq', id: '1') if actions.include?(:show)
-  end
-
-  it "to #update" do
-    put("/gitlabhq/#{controller}/1").should route_to("#{controller}#update", project_id: 'gitlabhq', id: '1') if actions.include?(:update)
-  end
-
-  it "to #destroy" do
-    delete("/gitlabhq/#{controller}/1").should route_to("#{controller}#destroy", project_id: 'gitlabhq', id: '1') if actions.include?(:destroy)
-  end
-end
-
 # search GET    /search(.:format) search#show
 describe SearchController, "routing" do
   it "to #show" do
@@ -225,53 +172,6 @@ describe DashboardController, "routing" do
   end
 end
 
-#      projects POST   /projects(.:format)     projects#create
-#   new_project GET    /projects/new(.:format) projects#new
-#  wall_project GET    /:id/wall(.:format)     projects#wall
-# graph_project GET    /:id/graph(.:format)    projects#graph
-# files_project GET    /:id/files(.:format)    projects#files
-#  edit_project GET    /:id/edit(.:format)     projects#edit
-#       project GET    /:id(.:format)          projects#show
-#               PUT    /:id(.:format)          projects#update
-#               DELETE /:id(.:format)          projects#destroy
-describe ProjectsController, "routing" do
-  it "to #create" do
-    post("/projects").should route_to('projects#create')
-  end
-
-  it "to #new" do
-    get("/projects/new").should route_to('projects#new')
-  end
-
-  it "to #wall" do
-    get("/gitlabhq/wall").should route_to('projects#wall', id: 'gitlabhq')
-  end
-
-  it "to #graph" do
-    get("/gitlabhq/graph").should route_to('projects#graph', id: 'gitlabhq')
-  end
-
-  it "to #files" do
-    get("/gitlabhq/files").should route_to('projects#files', id: 'gitlabhq')
-  end
-
-  it "to #edit" do
-    get("/gitlabhq/edit").should route_to('projects#edit', id: 'gitlabhq')
-  end
-
-  it "to #show" do
-    get("/gitlabhq").should route_to('projects#show', id: 'gitlabhq')
-  end
-
-  it "to #update" do
-    put("/gitlabhq").should route_to('projects#update', id: 'gitlabhq')
-  end
-
-  it "to #destroy" do
-    delete("/gitlabhq").should route_to('projects#destroy', id: 'gitlabhq')
-  end
-end
-
 #        new_user_session GET    /users/sign_in(.:format)               devise/sessions#new
 #            user_session POST   /users/sign_in(.:format)               devise/sessions#create
 #    destroy_user_session DELETE /users/sign_out(.:format)              devise/sessions#destroy
@@ -284,300 +184,3 @@ end
 describe "Authentication", "routing" do
   # pending
 end
-
-#  pages_project_wikis GET    /:project_id/wikis/pages(.:format)       wikis#pages
-# history_project_wiki GET    /:project_id/wikis/:id/history(.:format) wikis#history
-#        project_wikis POST   /:project_id/wikis(.:format)             wikis#create
-#    edit_project_wiki GET    /:project_id/wikis/:id/edit(.:format)    wikis#edit
-#         project_wiki GET    /:project_id/wikis/:id(.:format)         wikis#show
-#                      DELETE /:project_id/wikis/:id(.:format)         wikis#destroy
-describe WikisController, "routing" do
-  it "to #pages" do
-    get("/gitlabhq/wikis/pages").should route_to('wikis#pages', project_id: 'gitlabhq')
-  end
-
-  it "to #history" do
-    get("/gitlabhq/wikis/1/history").should route_to('wikis#history', project_id: 'gitlabhq', id: '1')
-  end
-
-  it_behaves_like "RESTful project resources" do
-    let(:actions)    { [:create, :edit, :show, :destroy] }
-    let(:controller) { 'wikis' }
-  end
-end
-
-# branches_project_repository GET    /:project_id/repository/branches(.:format) repositories#branches
-#     tags_project_repository GET    /:project_id/repository/tags(.:format)     repositories#tags
-#  archive_project_repository GET    /:project_id/repository/archive(.:format)  repositories#archive
-#          project_repository POST   /:project_id/repository(.:format)          repositories#create
-#      new_project_repository GET    /:project_id/repository/new(.:format)      repositories#new
-#     edit_project_repository GET    /:project_id/repository/edit(.:format)     repositories#edit
-#                             GET    /:project_id/repository(.:format)          repositories#show
-#                             PUT    /:project_id/repository(.:format)          repositories#update
-#                             DELETE /:project_id/repository(.:format)          repositories#destroy
-describe RepositoriesController, "routing" do
-  it "to #branches" do
-    get("/gitlabhq/repository/branches").should route_to('repositories#branches', project_id: 'gitlabhq')
-  end
-
-  it "to #tags" do
-    get("/gitlabhq/repository/tags").should route_to('repositories#tags', project_id: 'gitlabhq')
-  end
-
-  it "to #archive" do
-    get("/gitlabhq/repository/archive").should route_to('repositories#archive', project_id: 'gitlabhq')
-  end
-
-  it "to #create" do
-    post("/gitlabhq/repository").should route_to('repositories#create', project_id: 'gitlabhq')
-  end
-
-  it "to #new" do
-    get("/gitlabhq/repository/new").should route_to('repositories#new', project_id: 'gitlabhq')
-  end
-
-  it "to #edit" do
-    get("/gitlabhq/repository/edit").should route_to('repositories#edit', project_id: 'gitlabhq')
-  end
-
-  it "to #show" do
-    get("/gitlabhq/repository").should route_to('repositories#show', project_id: 'gitlabhq')
-  end
-
-  it "to #update" do
-    put("/gitlabhq/repository").should route_to('repositories#update', project_id: 'gitlabhq')
-  end
-
-  it "to #destroy" do
-    delete("/gitlabhq/repository").should route_to('repositories#destroy', project_id: 'gitlabhq')
-  end
-end
-
-#     project_deploy_keys GET    /:project_id/deploy_keys(.:format)          deploy_keys#index
-#                         POST   /:project_id/deploy_keys(.:format)          deploy_keys#create
-#  new_project_deploy_key GET    /:project_id/deploy_keys/new(.:format)      deploy_keys#new
-# edit_project_deploy_key GET    /:project_id/deploy_keys/:id/edit(.:format) deploy_keys#edit
-#      project_deploy_key GET    /:project_id/deploy_keys/:id(.:format)      deploy_keys#show
-#                         PUT    /:project_id/deploy_keys/:id(.:format)      deploy_keys#update
-#                         DELETE /:project_id/deploy_keys/:id(.:format)      deploy_keys#destroy
-describe DeployKeysController, "routing" do
-  it_behaves_like "RESTful project resources" do
-    let(:controller) { 'deploy_keys' }
-  end
-end
-
-# project_protected_branches GET    /:project_id/protected_branches(.:format)     protected_branches#index
-#                            POST   /:project_id/protected_branches(.:format)     protected_branches#create
-#   project_protected_branch DELETE /:project_id/protected_branches/:id(.:format) protected_branches#destroy
-describe ProtectedBranchesController, "routing" do
-  it_behaves_like "RESTful project resources" do
-    let(:actions)    { [:index, :create, :destroy] }
-    let(:controller) { 'protected_branches' }
-  end
-end
-
-#    switch_project_refs GET    /:project_id/switch(.:format)              refs#switch
-#       tree_project_ref GET    /:project_id/:id/tree(.:format)            refs#tree
-#  logs_tree_project_ref GET    /:project_id/:id/logs_tree(.:format)       refs#logs_tree
-#       blob_project_ref GET    /:project_id/:id/blob(.:format)            refs#blob
-#  tree_file_project_ref GET    /:project_id/:id/tree/:path(.:format)      refs#tree
-#  logs_file_project_ref GET    /:project_id/:id/logs_tree/:path(.:format) refs#logs_tree
-# blame_file_project_ref GET    /:project_id/:id/blame/:path(.:format)     refs#blame
-describe RefsController, "routing" do
-  it "to #switch" do
-    get("/gitlabhq/switch").should route_to('refs#switch', project_id: 'gitlabhq')
-  end
-
-  it "to #tree" do
-    get("/gitlabhq/stable/tree").should             route_to('refs#tree', project_id: 'gitlabhq', id: 'stable')
-    get("/gitlabhq/stable/tree/foo/bar/baz").should route_to('refs#tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
-  end
-
-  it "to #logs_tree" do
-    get("/gitlabhq/stable/logs_tree").should             route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
-    get("/gitlabhq/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
-  end
-
-  it "to #blob" do
-    get("/gitlabhq/stable/blob").should route_to('refs#blob', project_id: 'gitlabhq', id: 'stable')
-  end
-
-  it "to #blame" do
-    get("/gitlabhq/stable/blame/foo/bar/baz").should route_to('refs#blame', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
-  end
-end
-
-#           diffs_project_merge_request GET    /:project_id/merge_requests/:id/diffs(.:format)           merge_requests#diffs
-#       automerge_project_merge_request GET    /:project_id/merge_requests/:id/automerge(.:format)       merge_requests#automerge
-# automerge_check_project_merge_request GET    /:project_id/merge_requests/:id/automerge_check(.:format) merge_requests#automerge_check
-#             raw_project_merge_request GET    /:project_id/merge_requests/:id/raw(.:format)             merge_requests#raw
-#    branch_from_project_merge_requests GET    /:project_id/merge_requests/branch_from(.:format)         merge_requests#branch_from
-#      branch_to_project_merge_requests GET    /:project_id/merge_requests/branch_to(.:format)           merge_requests#branch_to
-#                project_merge_requests GET    /:project_id/merge_requests(.:format)                     merge_requests#index
-#                                       POST   /:project_id/merge_requests(.:format)                     merge_requests#create
-#             new_project_merge_request GET    /:project_id/merge_requests/new(.:format)                 merge_requests#new
-#            edit_project_merge_request GET    /:project_id/merge_requests/:id/edit(.:format)            merge_requests#edit
-#                 project_merge_request GET    /:project_id/merge_requests/:id(.:format)                 merge_requests#show
-#                                       PUT    /:project_id/merge_requests/:id(.:format)                 merge_requests#update
-#                                       DELETE /:project_id/merge_requests/:id(.:format)                 merge_requests#destroy
-describe MergeRequestsController, "routing" do
-  it "to #diffs" do
-    get("/gitlabhq/merge_requests/1/diffs").should route_to('merge_requests#diffs', project_id: 'gitlabhq', id: '1')
-  end
-
-  it "to #automerge" do
-    get("/gitlabhq/merge_requests/1/automerge").should route_to('merge_requests#automerge', project_id: 'gitlabhq', id: '1')
-  end
-
-  it "to #automerge_check" do
-    get("/gitlabhq/merge_requests/1/automerge_check").should route_to('merge_requests#automerge_check', project_id: 'gitlabhq', id: '1')
-  end
-
-  it "to #raw" do
-    get("/gitlabhq/merge_requests/1/raw").should route_to('merge_requests#raw', project_id: 'gitlabhq', id: '1')
-  end
-
-  it "to #branch_from" do
-    get("/gitlabhq/merge_requests/branch_from").should route_to('merge_requests#branch_from', project_id: 'gitlabhq')
-  end
-
-  it "to #branch_to" do
-    get("/gitlabhq/merge_requests/branch_to").should route_to('merge_requests#branch_to', project_id: 'gitlabhq')
-  end
-
-  it_behaves_like "RESTful project resources" do
-    let(:controller) { 'merge_requests' }
-  end
-end
-
-#  raw_project_snippet GET    /:project_id/snippets/:id/raw(.:format)  snippets#raw
-#     project_snippets GET    /:project_id/snippets(.:format)          snippets#index
-#                      POST   /:project_id/snippets(.:format)          snippets#create
-#  new_project_snippet GET    /:project_id/snippets/new(.:format)      snippets#new
-# edit_project_snippet GET    /:project_id/snippets/:id/edit(.:format) snippets#edit
-#      project_snippet GET    /:project_id/snippets/:id(.:format)      snippets#show
-#                      PUT    /:project_id/snippets/:id(.:format)      snippets#update
-#                      DELETE /:project_id/snippets/:id(.:format)      snippets#destroy
-describe SnippetsController, "routing" do
-  it "to #raw" do
-    get("/gitlabhq/snippets/1/raw").should route_to('snippets#raw', project_id: 'gitlabhq', id: '1')
-  end
-
-  it_behaves_like "RESTful project resources" do
-    let(:controller) { 'snippets' }
-  end
-end
-
-# test_project_hook GET    /:project_id/hooks/:id/test(.:format) hooks#test
-#     project_hooks GET    /:project_id/hooks(.:format)          hooks#index
-#                   POST   /:project_id/hooks(.:format)          hooks#create
-#      project_hook DELETE /:project_id/hooks/:id(.:format)      hooks#destroy
-describe HooksController, "routing" do
-  it "to #test" do
-    get("/gitlabhq/hooks/1/test").should route_to('hooks#test', project_id: 'gitlabhq', id: '1')
-  end
-
-  it_behaves_like "RESTful project resources" do
-    let(:actions)    { [:index, :create, :destroy] }
-    let(:controller) { 'hooks' }
-  end
-end
-
-# compare_project_commits GET    /:project_id/commits/compare(.:format)   commits#compare
-#    patch_project_commit GET    /:project_id/commits/:id/patch(.:format) commits#patch
-#         project_commits GET    /:project_id/commits(.:format)           commits#index
-#                         POST   /:project_id/commits(.:format)           commits#create
-#      new_project_commit GET    /:project_id/commits/new(.:format)       commits#new
-#     edit_project_commit GET    /:project_id/commits/:id/edit(.:format)  commits#edit
-#          project_commit GET    /:project_id/commits/:id(.:format)       commits#show
-#                         PUT    /:project_id/commits/:id(.:format)       commits#update
-#                         DELETE /:project_id/commits/:id(.:format)       commits#destroy
-describe CommitsController, "routing" do
-  it "to #compare" do
-    get("/gitlabhq/commits/compare").should route_to('commits#compare', project_id: 'gitlabhq')
-  end
-
-  it "to #patch" do
-    get("/gitlabhq/commits/1/patch").should route_to('commits#patch', project_id: 'gitlabhq', id: '1')
-  end
-
-  it_behaves_like "RESTful project resources" do
-    let(:controller) { 'commits' }
-  end
-end
-
-#     project_team_members GET    /:project_id/team_members(.:format)          team_members#index
-#                          POST   /:project_id/team_members(.:format)          team_members#create
-#  new_project_team_member GET    /:project_id/team_members/new(.:format)      team_members#new
-# edit_project_team_member GET    /:project_id/team_members/:id/edit(.:format) team_members#edit
-#      project_team_member GET    /:project_id/team_members/:id(.:format)      team_members#show
-#                          PUT    /:project_id/team_members/:id(.:format)      team_members#update
-#                          DELETE /:project_id/team_members/:id(.:format)      team_members#destroy
-describe TeamMembersController, "routing" do
-  it_behaves_like "RESTful project resources" do
-    let(:controller) { 'team_members' }
-  end
-end
-
-#     project_milestones GET    /:project_id/milestones(.:format)          milestones#index
-#                        POST   /:project_id/milestones(.:format)          milestones#create
-#  new_project_milestone GET    /:project_id/milestones/new(.:format)      milestones#new
-# edit_project_milestone GET    /:project_id/milestones/:id/edit(.:format) milestones#edit
-#      project_milestone GET    /:project_id/milestones/:id(.:format)      milestones#show
-#                        PUT    /:project_id/milestones/:id(.:format)      milestones#update
-#                        DELETE /:project_id/milestones/:id(.:format)      milestones#destroy
-describe MilestonesController, "routing" do
-  it_behaves_like "RESTful project resources" do
-    let(:controller) { 'milestones' }
-  end
-end
-
-# project_labels GET    /:project_id/labels(.:format) labels#index
-describe LabelsController, "routing" do
-  it "to #index" do
-    get("/gitlabhq/labels").should route_to('labels#index', project_id: 'gitlabhq')
-  end
-end
-
-#        sort_project_issues POST   /:project_id/issues/sort(.:format)        issues#sort
-# bulk_update_project_issues POST   /:project_id/issues/bulk_update(.:format) issues#bulk_update
-#      search_project_issues GET    /:project_id/issues/search(.:format)      issues#search
-#             project_issues GET    /:project_id/issues(.:format)             issues#index
-#                            POST   /:project_id/issues(.:format)             issues#create
-#          new_project_issue GET    /:project_id/issues/new(.:format)         issues#new
-#         edit_project_issue GET    /:project_id/issues/:id/edit(.:format)    issues#edit
-#              project_issue GET    /:project_id/issues/:id(.:format)         issues#show
-#                            PUT    /:project_id/issues/:id(.:format)         issues#update
-#                            DELETE /:project_id/issues/:id(.:format)         issues#destroy
-describe IssuesController, "routing" do
-  it "to #sort" do
-    post("/gitlabhq/issues/sort").should route_to('issues#sort', project_id: 'gitlabhq')
-  end
-
-  it "to #bulk_update" do
-    post("/gitlabhq/issues/bulk_update").should route_to('issues#bulk_update', project_id: 'gitlabhq')
-  end
-
-  it "to #search" do
-    get("/gitlabhq/issues/search").should route_to('issues#search', project_id: 'gitlabhq')
-  end
-
-  it_behaves_like "RESTful project resources" do
-    let(:controller) { 'issues' }
-  end
-end
-
-# preview_project_notes POST   /:project_id/notes/preview(.:format) notes#preview
-#         project_notes GET    /:project_id/notes(.:format)         notes#index
-#                       POST   /:project_id/notes(.:format)         notes#create
-#          project_note DELETE /:project_id/notes/:id(.:format)     notes#destroy
-describe NotesController, "routing" do
-  it "to #preview" do
-    post("/gitlabhq/notes/preview").should route_to('notes#preview', project_id: 'gitlabhq')
-  end
-
-  it_behaves_like "RESTful project resources" do
-    let(:actions)    { [:index, :create, :destroy] }
-    let(:controller) { 'notes' }
-  end
-end