diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-04 12:03:48 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-04 12:03:48 +0000 |
| commit | 5fd70f1779fa9ea0bd5eda523833996f71d0e706 (patch) | |
| tree | 27aa4cb0a5713aa7bca5eb8a5d1180d00e414089 /app/models/key.rb | |
| parent | 72797b30479b8649cd4e4b42bb940093648daa9c (diff) | |
| parent | d2ea615415311e7da1daf6b0a4e5c3a23fb2f1c2 (diff) | |
| download | gitlab-ce-patch-66.tar.gz | |
Merge branch 'master' into 'patch-66'patch-66
# Conflicts:
# doc/administration/high_availability/gitaly.md
Diffstat (limited to 'app/models/key.rb')
| -rw-r--r-- | app/models/key.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/key.rb b/app/models/key.rb index b097be8cc89..8aa25924c28 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -59,6 +59,11 @@ class Key < ApplicationRecord "key-#{id}" end + # EE overrides this + def can_delete? + true + end + # rubocop: disable CodeReuse/ServiceClass def update_last_used_at Keys::LastUsedService.new(self).execute |