diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-06-01 17:59:04 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-06-01 17:59:04 +0000 |
| commit | 81e899ea7141b34a7860f308327249784fb5d6cc (patch) | |
| tree | dfb47ec0b8c866c8232b367d2d9d82a1887024bc /app/models/remote_mirror.rb | |
| parent | 160cc6cd7b0218cdd1e210c4133fd469ffacf656 (diff) | |
| parent | b5c706326ada2c0d213dd512842c5f677d9d94f9 (diff) | |
| download | gitlab-ce-81e899ea7141b34a7860f308327249784fb5d6cc.tar.gz | |
Merge branch 'sh-bump-ruby-2.4' into 'master'
Upgrade to Ruby 2.4.4
See merge request gitlab-org/gitlab-ce!19055
Diffstat (limited to 'app/models/remote_mirror.rb')
| -rw-r--r-- | app/models/remote_mirror.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/remote_mirror.rb b/app/models/remote_mirror.rb index 9722cbb2b7c..5cd222e18a4 100644 --- a/app/models/remote_mirror.rb +++ b/app/models/remote_mirror.rb @@ -5,7 +5,7 @@ class RemoteMirror < ActiveRecord::Base UNPROTECTED_BACKOFF_DELAY = 5.minutes attr_encrypted :credentials, - key: Gitlab::Application.secrets.db_key_base, + key: Settings.attr_encrypted_db_key_base, marshal: true, encode: true, mode: :per_attribute_iv_and_salt, |