diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-13 14:53:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-09-13 14:53:05 +0000 |
| commit | c7d1eef671dbf598814a6c2ff1f81b924583ae8a (patch) | |
| tree | 23988df1d29e933943858a66821ba7f493976b3e /app/controllers/projects/deploy_keys_controller.rb | |
| parent | ff5d8b635f234241441009e41af7b61f5804b2c2 (diff) | |
| parent | 2039c8280db1646845c33d6c5a74e5f23ca6f4de (diff) | |
| download | gitlab-ce-c7d1eef671dbf598814a6c2ff1f81b924583ae8a.tar.gz | |
Merge branch 'rubocop-code-reuse' into 'master'
Add RuboCop cops to enforce code reusing rules
See merge request gitlab-org/gitlab-ce!21391
Diffstat (limited to 'app/controllers/projects/deploy_keys_controller.rb')
| -rw-r--r-- | app/controllers/projects/deploy_keys_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb index 28fea322334..2555139cd2c 100644 --- a/app/controllers/projects/deploy_keys_controller.rb +++ b/app/controllers/projects/deploy_keys_controller.rb @@ -52,6 +52,7 @@ class Projects::DeployKeysController < Projects::ApplicationController end end + # rubocop: disable CodeReuse/ActiveRecord def disable deploy_key_project = @project.deploy_keys_projects.find_by(deploy_key_id: params[:id]) return render_404 unless deploy_key_project @@ -63,6 +64,7 @@ class Projects::DeployKeysController < Projects::ApplicationController format.json { head :ok } end end + # rubocop: enable CodeReuse/ActiveRecord protected |