diff options
author | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
---|---|---|
committer | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
commit | 25c959f94d3dda63120256735163e4a142b8711e (patch) | |
tree | 4c6e544a665dab5b59106ace9638dca16b71d806 /app/controllers/admin/deploy_keys_controller.rb | |
parent | b20595b2bd0023ebbc2ec46017f5d1cb1533fb4f (diff) | |
parent | 3dd2248605ce2183f02ab268fc1f8b0b164f0bed (diff) | |
download | gitlab-ce-25c959f94d3dda63120256735163e4a142b8711e.tar.gz |
Merge branch 'master' into 'issue_37640'issue_37640
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/controllers/admin/deploy_keys_controller.rb')
-rw-r--r-- | app/controllers/admin/deploy_keys_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/admin/deploy_keys_controller.rb b/app/controllers/admin/deploy_keys_controller.rb index e5cba774dcb..a7ab481519d 100644 --- a/app/controllers/admin/deploy_keys_controller.rb +++ b/app/controllers/admin/deploy_keys_controller.rb @@ -10,9 +10,8 @@ class Admin::DeployKeysController < Admin::ApplicationController end def create - @deploy_key = deploy_keys.new(create_params.merge(user: current_user)) - - if @deploy_key.save + @deploy_key = DeployKeys::CreateService.new(current_user, create_params.merge(public: true)).execute + if @deploy_key.persisted? redirect_to admin_deploy_keys_path else render 'new' |