diff options
| author | Alexander Randa <randa.alex@gmail.com> | 2017-06-20 09:37:07 +0000 |
|---|---|---|
| committer | Alexander Randa <randa.alex@gmail.com> | 2017-06-20 11:23:13 +0000 |
| commit | c7bcebd56e264772a8fe177e64476ea7b2b80144 (patch) | |
| tree | dc224aa7476c7e8f87df51bb63965d2e9033db4f /app/controllers | |
| parent | 5214e507b043c8e71d2826252491cdac97d27416 (diff) | |
| download | gitlab-ce-c7bcebd56e264772a8fe177e64476ea7b2b80144.tar.gz | |
Fix edit button for deploy keys available from other projects
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/deploy_keys_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb index 7f1469e107d..c2e621fa190 100644 --- a/app/controllers/projects/deploy_keys_controller.rb +++ b/app/controllers/projects/deploy_keys_controller.rb @@ -6,7 +6,7 @@ class Projects::DeployKeysController < Projects::ApplicationController before_action :authorize_admin_project! before_action :authorize_update_deploy_key!, only: [:edit, :update] - layout "project_settings" + layout 'project_settings' def index respond_to do |format| @@ -66,7 +66,7 @@ class Projects::DeployKeysController < Projects::ApplicationController protected def deploy_key - @deploy_key ||= @project.deploy_keys.find(params[:id]) + @deploy_key ||= DeployKey.find(params[:id]) end def create_params |