summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-09-11 09:34:22 +0000
committerDouwe Maan <douwe@gitlab.com>2017-09-11 09:34:22 +0000
commit2071671cd0deb39ab29dda7d04e48a649c3643cb (patch)
treece378ae74fd6b6b8b80c41c36fefe22ccd4f6343
parent5136abae7c3f034ebe38d4a88000fa764a351650 (diff)
parentcab6745f5310d15476b5d055c6bfeeccccedebf2 (diff)
downloadgitlab-ce-2071671cd0deb39ab29dda7d04e48a649c3643cb.tar.gz
Merge branch 'feature/gpg-verification-status-remove-ignore-rule' into 'master'
Remove ignore rule for GpgSignature#valid_signature See merge request !14050
-rw-r--r--app/models/gpg_signature.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/app/models/gpg_signature.rb b/app/models/gpg_signature.rb
index 454c90d5fc4..1f047a32c84 100644
--- a/app/models/gpg_signature.rb
+++ b/app/models/gpg_signature.rb
@@ -1,8 +1,5 @@
class GpgSignature < ActiveRecord::Base
include ShaAttribute
- include IgnorableColumn
-
- ignore_column :valid_signature
sha_attribute :commit_sha
sha_attribute :gpg_key_primary_keyid