diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-25 09:09:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-25 09:09:02 +0300 |
commit | 807d57c18fdde0d9ba991a2b3b078a74a7472f30 (patch) | |
tree | d327848aee84f9af2fef556a0652b2f6e5da7aea /app/models/deploy_key.rb | |
parent | 3bd9ad5574f2ee81888dc13bc29e1d66dafaedba (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/deploy_key.rb')
-rw-r--r-- | app/models/deploy_key.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb index db5fd167781..25e3b9fe4f0 100644 --- a/app/models/deploy_key.rb +++ b/app/models/deploy_key.rb @@ -13,8 +13,6 @@ class DeployKey < Key scope :are_public, -> { where(public: true) } scope :with_projects, -> { includes(deploy_keys_projects: { project: [:route, namespace: :route] }) } - ignore_column :can_push, remove_after: '2019-12-15', remove_with: '12.6' - accepts_nested_attributes_for :deploy_keys_projects def private? |