diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-19 19:23:55 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-19 19:23:55 +0000 |
| commit | 832235395d83b06ca6de773847ebfb309c9af32d (patch) | |
| tree | 3aeefa67415179f8e6401f1435044e1adc3a5f0e /app/controllers | |
| parent | 347d16336246a20815f4a33b3d2cb32733fc6715 (diff) | |
| parent | fa7ed15df69a9ed7bb7c9442aac1e379585e3ff1 (diff) | |
| download | gitlab-ce-832235395d83b06ca6de773847ebfb309c9af32d.tar.gz | |
Merge branch 'ce-reduce-deploy_keys_controller-diff-with-ce' into 'master'
Make Projects::DeployKeysController EE-ready
See merge request gitlab-org/gitlab-ce!23911
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/deploy_keys_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb index 0a593bd35b6..6824a07dc76 100644 --- a/app/controllers/projects/deploy_keys_controller.rb +++ b/app/controllers/projects/deploy_keys_controller.rb @@ -24,7 +24,7 @@ class Projects::DeployKeysController < Projects::ApplicationController end def create - @key = DeployKeys::CreateService.new(current_user, create_params).execute + @key = DeployKeys::CreateService.new(current_user, create_params).execute(project: @project) unless @key.valid? flash[:alert] = @key.errors.full_messages.join(', ').html_safe |