summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-27 09:37:33 +0000
committerRémy Coutable <remy@rymai.me>2016-07-27 09:37:33 +0000
commit260102b288bffa9048c3fccfc49cc1c44dfc1095 (patch)
tree5a0c12d8bf97b10eebd8f50406a48433a74e8e56 /config
parentf88bb5a52e95ad81c1b9314523cc02ade0e2834a (diff)
parent774997e964ca7724a37d3f17a75f3224f8ce896c (diff)
downloadgitlab-ce-260102b288bffa9048c3fccfc49cc1c44dfc1095.tar.gz
Merge branch '14584-remove-routes-that-we-do-not-use-anymore' into 'master'
Resolve "Remove routes that we do not use anymore" _Originally opened at !4059 by @strzibny._ - - - ## What does this MR do? > I tried to clean up the routes as mentioned in #14584 I used the following script and manually verified the changes: https://gist.github.com/strzibny/4ccbda7dcf67ef6719dcb047014e1ea7 After this patch, the script still gives me the following routes: Unused routes (7): oauth/authorizations#show doorkeeper/tokens#create doorkeeper/tokens#revoke oauth/applications#edit oauth/applications#show doorkeeper/token_info#show omniauth_callbacks#(?-mix:(?!)) Here is a relevant code from doorkeeper on drawing these routes: https://github.com/doorkeeper-gem/doorkeeper/blob/5ea4575863781940fe6996692c6b41f2ad71d90e/lib/doorkeeper/rails/routes.rb#L25 ## What are the relevant issue numbers? Closes #14584. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5499
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb22
1 files changed, 10 insertions, 12 deletions
diff --git a/config/routes.rb b/config/routes.rb
index a41a04a0b38..414ba69dfae 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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
@@ -144,13 +143,13 @@ Rails.application.routes.draw do
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
@@ -301,7 +299,7 @@ Rails.application.routes.draw do
end
end
- resource :appearances, path: 'appearance' do
+ resource :appearances, only: [:show, :create, :update], path: 'appearance' do
member do
get :preview
delete :logo
@@ -310,7 +308,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
@@ -347,7 +345,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
@@ -359,7 +357,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]
@@ -661,7 +659,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
@@ -783,7 +781,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
@@ -808,7 +806,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