diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-19 09:09:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-19 09:09:25 +0000 |
| commit | 586816aece7cf3a96d0f4948d5dbf2a8e2a9a187 (patch) | |
| tree | 4f6490b96eeb5ebdd6bb4b87a91d01c5c07104d9 /lib/gitlab | |
| parent | 637ab60c608cd531c1cc8ad130c7606ca2716ba6 (diff) | |
| parent | fdad576838c16d0ae7d181e85a5889d8ae4e5014 (diff) | |
| download | gitlab-ce-586816aece7cf3a96d0f4948d5dbf2a8e2a9a187.tar.gz | |
Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'
Fix Error 500 when viewing a commit with a GPG signature in Geo
Closes gitlab-ee#4825
See merge request gitlab-org/gitlab-ce!17207
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/gpg/commit.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/gpg/commit.rb b/lib/gitlab/gpg/commit.rb index 672b5579dfd..90dd569aaf8 100644 --- a/lib/gitlab/gpg/commit.rb +++ b/lib/gitlab/gpg/commit.rb @@ -60,7 +60,9 @@ module Gitlab def create_cached_signature! using_keychain do |gpg_key| - GpgSignature.create!(attributes(gpg_key)) + signature = GpgSignature.new(attributes(gpg_key)) + signature.save! unless Gitlab::Database.read_only? + signature end end |