Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-10-07 22:16:18 +0300
committerStan Hu <stanhu@gmail.com>2017-10-07 22:16:18 +0300
commit01d7335b43256867ab8cc05c0e14844c9faeb916 (patch)
tree331da0dbc62a970fc4b87a7e4efe5480eb288c62 /app
parent3e96288aa4715658c055894513fb640d3637b933 (diff)
parent4aa2deb4782f1f3b516bfaecdb57203765bbb123 (diff)
Merge branch '38890-fix-gpg-signature-updater-when-commit-is-missing' into 'master'
Fix error with GPG signature updater when commit was deleted Closes #38890 See merge request gitlab-org/gitlab-ce!14749
Diffstat (limited to 'app')
-rw-r--r--app/models/gpg_signature.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/gpg_signature.rb b/app/models/gpg_signature.rb
index 675e7a2456d..bf88d75246f 100644
--- a/app/models/gpg_signature.rb
+++ b/app/models/gpg_signature.rb
@@ -60,6 +60,8 @@ class GpgSignature < ActiveRecord::Base
end
def gpg_commit
+ return unless commit
+
Gitlab::Gpg::Commit.new(commit)
end
end