Clean up unused routes

This commit is contained in:
Josef Strzibny 2016-05-04 00:32:14 +02:00 committed by Rémy Coutable
parent e9946f19a5
commit 34a1e9633f
4 changed files with 12 additions and 31 deletions

View File

@ -42,10 +42,9 @@ Rails.application.routes.draw do
resource :lint, only: [:show, :create]
resources :projects do
resources :projects, only: [:index, :show] do
member do
get :status, to: 'projects#badge'
get :integration
end
end
@ -137,20 +136,20 @@ Rails.application.routes.draw do
# Import
#
namespace :import do
resource :github, only: [:create, :new], controller: :github do
resource :github, only: [:create], controller: :github do
post :personal_access_token
get :status
get :callback
get :jobs
end
resource :gitlab, only: [:create, :new], controller: :gitlab do
resource :gitlab, only: [:create], controller: :gitlab do
get :status
get :callback
get :jobs
end
resource :bitbucket, only: [:create, :new], controller: :bitbucket do
resource :bitbucket, only: [:create], controller: :bitbucket do
get :status
get :callback
get :jobs
@ -243,7 +242,6 @@ Rails.application.routes.draw do
get :projects
get :keys
get :groups
put :team_update
put :block
put :unblock
put :unlock
@ -296,11 +294,11 @@ Rails.application.routes.draw do
post :repository_check
end
resources :runner_projects, only: [:create, :destroy]
resources :runner_projects, only: [:index, :create, :destroy]
end
end
resource :appearances, path: 'appearance' do
resource :appearances, only: [:show, :create, :update], path: 'appearance' do
member do
get :preview
delete :logo
@ -309,7 +307,7 @@ Rails.application.routes.draw do
end
resource :application_settings, only: [:show, :update] do
resources :services
resources :services, only: [:index, :edit, :update]
put :reset_runners_token
put :reset_health_check_token
put :clear_repository_check_states
@ -346,7 +344,7 @@ Rails.application.routes.draw do
end
scope module: :profiles do
resource :account, only: [:show, :update] do
resource :account, only: [:show] do
member do
delete :unlink
end
@ -358,7 +356,7 @@ Rails.application.routes.draw do
end
end
resource :preferences, only: [:show, :update]
resources :keys
resources :keys, only: [:index, :show, :new, :create, :destroy]
resources :emails, only: [:index, :create, :destroy]
resource :avatar, only: [:destroy]
@ -660,7 +658,7 @@ Rails.application.routes.draw do
post '/wikis/*id/markdown_preview', to: 'wikis#markdown_preview', constraints: WIKI_SLUG_ID, as: 'wiki_markdown_preview'
end
resource :repository, only: [:show, :create] do
resource :repository, only: [:create] do
member do
get 'archive', constraints: { format: Gitlab::Regex.archive_formats_regex }
end
@ -782,7 +780,7 @@ Rails.application.routes.draw do
end
end
resources :labels, constraints: { id: /\d+/ } do
resources :labels, except: [:show], constraints: { id: /\d+/ } do
collection do
post :generate
post :set_priorities
@ -807,7 +805,7 @@ Rails.application.routes.draw do
end
end
resources :project_members, except: [:new, :edit], constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ }, concerns: :access_requestable do
resources :project_members, except: [:show, :new, :edit], constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ }, concerns: :access_requestable do
collection do
delete :leave

View File

@ -1,6 +1,5 @@
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
@ -11,10 +10,6 @@ require 'spec_helper'
# 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
expect(put("/admin/users/1/team_update")).to route_to('admin/users#team_update', id: '1')
end
it "to #block" do
expect(put("/admin/users/1/block")).to route_to('admin/users#block', id: '1')
end

View File

@ -135,10 +135,6 @@ describe Projects::RepositoriesController, 'routing' do
it 'to #archive format:tar.bz2' do
expect(get('/gitlab/gitlabhq/repository/archive.tar.bz2')).to route_to('projects/repositories#archive', namespace_id: 'gitlab', project_id: 'gitlabhq', format: 'tar.bz2')
end
it 'to #show' do
expect(get('/gitlab/gitlabhq/repository')).to route_to('projects/repositories#show', namespace_id: 'gitlab', project_id: 'gitlabhq')
end
end
describe Projects::BranchesController, 'routing' do

View File

@ -176,18 +176,10 @@ describe Profiles::KeysController, "routing" do
expect(post("/profile/keys")).to route_to('profiles/keys#create')
end
it "to #edit" do
expect(get("/profile/keys/1/edit")).to route_to('profiles/keys#edit', id: '1')
end
it "to #show" do
expect(get("/profile/keys/1")).to route_to('profiles/keys#show', id: '1')
end
it "to #update" do
expect(put("/profile/keys/1")).to route_to('profiles/keys#update', id: '1')
end
it "to #destroy" do
expect(delete("/profile/keys/1")).to route_to('profiles/keys#destroy', id: '1')
end