diff options
author | Jasper Maes <jaspermaes.jm@gmail.com> | 2019-01-15 22:05:36 +0100 |
---|---|---|
committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2019-03-11 21:44:22 +0100 |
commit | 3da8f4b90978a12ddbc282d5ec0be621d203f1b9 (patch) | |
tree | 48f49644020c07ce2dd1ffa30f8540db4eef228f /app/models/remote_mirror.rb | |
parent | fcf632ef99fee06de42216e769ddfeb28967f17c (diff) | |
download | gitlab-ce-3da8f4b90978a12ddbc282d5ec0be621d203f1b9.tar.gz |
Upgrade Rails to 5.1.6.1jlemaes/gitlab-ce-rails5.1
Model.new.attributes now also returns encrypted attributes.
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 5eba7ddd75c..ca4be8805a7 100644 --- a/app/models/remote_mirror.rb +++ b/app/models/remote_mirror.rb @@ -248,7 +248,7 @@ class RemoteMirror < ActiveRecord::Base # Before adding a new remote we have to delete the data from # the previous remote name - prev_remote_name = remote_name_was || fallback_remote_name + prev_remote_name = remote_name_before_last_save || fallback_remote_name run_after_commit do project.repository.async_remove_remote(prev_remote_name) end |