diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 15:08:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 15:08:01 +0000 |
| commit | 53b1f4eaa2a451aaba908a5fee7ce97a930021ac (patch) | |
| tree | 66501ec0de9f529ee1cfc7cd6c4b481b1fc76662 /app/models | |
| parent | 684d65316ac77c62f47d68b9926eea8af30db227 (diff) | |
| download | gitlab-ce-53b1f4eaa2a451aaba908a5fee7ce97a930021ac.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/award_emoji.rb | 2 | ||||
| -rw-r--r-- | app/models/remote_mirror.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/award_emoji.rb b/app/models/award_emoji.rb index 5a33a8f89df..5ba6100f169 100644 --- a/app/models/award_emoji.rb +++ b/app/models/award_emoji.rb @@ -15,7 +15,7 @@ class AwardEmoji < ApplicationRecord validates :awardable, presence: true, unless: :importing? validates :name, presence: true, inclusion: { in: Gitlab::Emoji.emojis_names } - validates :name, uniqueness: { scope: [:user, :awardable_type, :awardable_id] }, unless: :ghost_user? + validates :name, uniqueness: { scope: [:user, :awardable_type, :awardable_id] }, unless: -> { ghost_user? || importing? } participant :user diff --git a/app/models/remote_mirror.rb b/app/models/remote_mirror.rb index 1e5c93cd913..0334d63dd36 100644 --- a/app/models/remote_mirror.rb +++ b/app/models/remote_mirror.rb @@ -117,6 +117,8 @@ class RemoteMirror < ApplicationRecord end end + options[:keep_divergent_refs] = keep_divergent_refs? + Gitlab::Git::RemoteMirror.new( project.repository.raw, remote_name, |