diff options
author | Alexis Reigel <mail@koffeinfrei.org> | 2017-08-24 14:21:26 +0200 |
---|---|---|
committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-09-05 12:18:31 +0200 |
commit | 508ff17b3405a4e2275fa137bd7322b728db8ed4 (patch) | |
tree | 7e00cb57f432d92b4a6af349678efe54bb2546cb /app/models | |
parent | ff413ec28d5f0721646cea223fb5e5a054bde31e (diff) | |
download | gitlab-ce-508ff17b3405a4e2275fa137bd7322b728db8ed4.tar.gz |
pass whole commit to Gitlab::Gpg::Commit again
we need the commit object for the updated verification that also checks
the committer's email to match the gpg key and user's emails.
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/commit.rb | 2 | ||||
-rw-r--r-- | app/models/gpg_signature.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index c943365016f..ba3845df867 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -405,6 +405,6 @@ class Commit end def gpg_commit - @gpg_commit ||= Gitlab::Gpg::Commit.for_commit(self) + @gpg_commit ||= Gitlab::Gpg::Commit.new(self) end end diff --git a/app/models/gpg_signature.rb b/app/models/gpg_signature.rb index 50fb35c77ec..6680bc4da0b 100644 --- a/app/models/gpg_signature.rb +++ b/app/models/gpg_signature.rb @@ -20,6 +20,6 @@ class GpgSignature < ActiveRecord::Base end def gpg_commit - Gitlab::Gpg::Commit.new(project, commit_sha) + Gitlab::Gpg::Commit.new(commit) end end |