Skip to content
Snippets Groups Projects
Commit 6e5473f9 authored by Robert Speicher's avatar Robert Speicher
Browse files

Remove show actions from Admin and Project DeployKeys

parent 83e59db5
No related branches found
No related tags found
No related merge requests found
class Admin::DeployKeysController < Admin::ApplicationController
before_action :deploy_keys, only: [:index]
before_action :deploy_key, only: [:show, :destroy]
before_action :deploy_key, only: [:destroy]
 
def index
end
def show
end
 
def new
Loading
Loading
Loading
Loading
@@ -18,10 +18,6 @@ class Projects::DeployKeysController < Projects::ApplicationController
@available_public_keys -= @available_project_keys
end
 
def show
@key = @project.deploy_keys.find(params[:id])
end
def new
@key = @project.deploy_keys.new
 
Loading
Loading
- page_title @deploy_key.title, "Deploy Keys"
.row
.col-md-4
.panel.panel-default
.panel-heading
Deploy Key
%ul.well-list
%li
%span.light Title:
%strong= @deploy_key.title
%li
%span.light Created on:
%strong= @deploy_key.created_at.stamp("Aug 21, 2011")
.panel.panel-default
.panel-heading Projects (#{@deploy_key.deploy_keys_projects.count})
- if @deploy_key.deploy_keys_projects.any?
%ul.well-list
- @deploy_key.projects.each do |project|
%li
%span
%strong
= link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project]
.pull-right
= link_to disable_namespace_project_deploy_key_path(project.namespace, project, @deploy_key), data: { confirm: "Are you sure?" }, method: :put, class: "btn-xs btn btn-remove", title: 'Remove deploy key from project' do
%i.fa.fa-times.fa-inverse
.col-md-8
%p
%span.light Fingerprint:
%strong= @deploy_key.fingerprint
%pre.well-pre
= @deploy_key.key
.pull-right
= link_to 'Remove', admin_deploy_key_path(@deploy_key), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"
- page_title @key.title, "Deploy Keys"
%h3.page-title
Deploy key:
= @key.title
%small
created on
= @key.created_at.stamp("Aug 21, 2011")
.back-link
= link_to namespace_project_deploy_keys_path(@project.namespace, @project) do
&larr; To keys list
%hr
%pre= @key.key
.pull-right
= link_to 'Remove', namespace_project_deploy_key_path(@project.namespace, @project, @key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn-remove btn delete-key"
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -8,11 +8,6 @@ Feature: Admin Deploy Keys
When I visit admin deploy keys page
Then I should see all public deploy keys
 
Scenario: Deploy Keys show
When I visit admin deploy keys page
And I click on first deploy key
Then I should see deploy key details
Scenario: Deploy Keys new
When I visit admin deploy keys page
And I click 'New Deploy Key'
Loading
Loading
Loading
Loading
@@ -14,17 +14,6 @@ class Spinach::Features::AdminDeployKeys < Spinach::FeatureSteps
end
end
 
step 'I click on first deploy key' do
click_link DeployKey.are_public.first.title
end
step 'I should see deploy key details' do
deploy_key = DeployKey.are_public.first
current_path.should == admin_deploy_key_path(deploy_key)
page.should have_content(deploy_key.title)
page.should have_content(deploy_key.key)
end
step 'I visit admin deploy key page' do
visit admin_deploy_key_path(deploy_key)
end
Loading
Loading
Loading
Loading
@@ -172,7 +172,7 @@ end
# DELETE /:project_id/deploy_keys/:id(.:format) deploy_keys#destroy
describe Projects::DeployKeysController, 'routing' do
it_behaves_like 'RESTful project resources' do
let(:actions) { [:index, :show, :new, :create] }
let(:actions) { [:index, :new, :create] }
let(:controller) { 'deploy_keys' }
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment