diff options
Diffstat (limited to 'app/models/remote_mirror.rb')
-rw-r--r-- | app/models/remote_mirror.rb | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/app/models/remote_mirror.rb b/app/models/remote_mirror.rb index 5eba7ddd75c..78b4689338a 100644 --- a/app/models/remote_mirror.rb +++ b/app/models/remote_mirror.rb @@ -8,16 +8,16 @@ class RemoteMirror < ActiveRecord::Base UNPROTECTED_BACKOFF_DELAY = 5.minutes attr_encrypted :credentials, - key: Settings.attr_encrypted_db_key_base, - marshal: true, - encode: true, - mode: :per_attribute_iv_and_salt, - insecure_mode: true, - algorithm: 'aes-256-cbc' + key: Settings.attr_encrypted_db_key_base, + marshal: true, + encode: true, + mode: :per_attribute_iv_and_salt, + insecure_mode: true, + algorithm: "aes-256-cbc" belongs_to :project, inverse_of: :remote_mirrors - validates :url, presence: true, public_url: { protocols: %w(ssh git http https), allow_blank: true, enforce_user: true } + validates :url, presence: true, public_url: {protocols: %w[ssh git http https], allow_blank: true, enforce_user: true} before_save :set_new_remote_name, if: :mirror_url_changed? @@ -31,7 +31,7 @@ class RemoteMirror < ActiveRecord::Base scope :enabled, -> { where(enabled: true) } scope :started, -> { with_update_status(:started) } - scope :stuck, -> { started.where('last_update_at < ? OR (last_update_at IS NULL AND updated_at < ?)', 1.day.ago, 1.day.ago) } + scope :stuck, -> { started.where("last_update_at < ? OR (last_update_at IS NULL AND updated_at < ?)", 1.day.ago, 1.day.ago) } state_machine :update_status, initial: :none do event :update_start do @@ -84,11 +84,11 @@ class RemoteMirror < ActiveRecord::Base end def update_failed? - update_status == 'failed' + update_status == "failed" end def update_in_progress? - update_status == 'started' + update_status == "started" end def update_repository(options) @@ -117,9 +117,9 @@ class RemoteMirror < ActiveRecord::Base return unless sync? if recently_scheduled? - RepositoryUpdateRemoteMirrorWorker.perform_in(backoff_delay, self.id, Time.now) + RepositoryUpdateRemoteMirrorWorker.perform_in(backoff_delay, id, Time.now) else - RepositoryUpdateRemoteMirrorWorker.perform_async(self.id, Time.now) + RepositoryUpdateRemoteMirrorWorker.perform_async(id, Time.now) end end @@ -131,7 +131,7 @@ class RemoteMirror < ActiveRecord::Base true end - alias_method :enabled?, :enabled + alias enabled? enabled def updated_since?(timestamp) last_update_started_at && last_update_started_at > timestamp && !update_failed? @@ -168,8 +168,8 @@ class RemoteMirror < ActiveRecord::Base return if url.nil? result = URI.parse(url) - result.password = '*****' if result.password - result.user = '*****' if result.user && result.user != "git" # tokens or other data may be saved as user + result.password = "*****" if result.password + result.user = "*****" if result.user && result.user != "git" # tokens or other data may be saved as user result.to_s end @@ -198,7 +198,7 @@ class RemoteMirror < ActiveRecord::Base def remote_url return url unless ssh_key_auth? && password.present? - Gitlab::UrlSanitizer.new(read_attribute(:url), credentials: { user: user }).full_url + Gitlab::UrlSanitizer.new(read_attribute(:url), credentials: {user: user}).full_url rescue super end @@ -210,13 +210,13 @@ class RemoteMirror < ActiveRecord::Base end def recently_scheduled? - return false unless self.last_update_started_at + return false unless last_update_started_at - self.last_update_started_at >= Time.now - backoff_delay + last_update_started_at >= Time.now - backoff_delay end def backoff_delay - if self.only_protected_branches + if only_protected_branches PROTECTED_BACKOFF_DELAY else UNPROTECTED_BACKOFF_DELAY @@ -228,7 +228,7 @@ class RemoteMirror < ActiveRecord::Base last_error: nil, last_update_at: nil, last_successful_update_at: nil, - update_status: 'finished', + update_status: "finished", error_notification_sent: false ) end |