Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-04 11:34:25 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-04 11:34:25 +0300
commit971e57cffa6a89ebcd4da83efc4967f834f8f58b (patch)
treed592d0c03af78a23f4cdfdd8a75f11e6dd90781f /config
parent83e59db55e9bd65a41af69eda893ef39e8fd7aed (diff)
parent793d9799b64c1a46b6e7f45a74c89c3298ad0221 (diff)
Merge branch 'rs-issue-1741' into 'master'
Remove show actions from Admin and Project DeployKeys Example styling after: > ![Screen_Shot_2015-06-03_at_6.04.51_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/105801a7e390224066721bba200c4909/Screen_Shot_2015-06-03_at_6.04.51_PM.png) Closes #1741 See merge request !763
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb
index b7380254abb..f4a104664f3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -165,7 +165,7 @@ Gitlab::Application.routes.draw do
end
end
- resources :deploy_keys, only: [:index, :show, :new, :create, :destroy]
+ resources :deploy_keys, only: [:index, :new, :create, :destroy]
resources :hooks, only: [:index, :create, :destroy] do
get :test
@@ -421,7 +421,7 @@ Gitlab::Application.routes.draw do
end
end
- resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :show, :new, :create] do
+ resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create] do
member do
put :enable
put :disable