diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 21:09:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 21:09:24 +0300 |
| commit | 619d0b6922a6cf95d291fbbf5fa3d09e772a1ea8 (patch) | |
| tree | fb8f8e036cec1b32166206bb5102af6c5dca8cfe /app/models | |
| parent | 17ab40ca089e1aef61a83f77ab6df62a72f6ce06 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 | ||||
| -rw-r--r-- | app/models/repository.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 4ae64b6c8f1..869a2e8da20 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -599,7 +599,7 @@ module Ci # Manually set the notes for a Ci::Pipeline # There is no ActiveRecord relation between Ci::Pipeline and notes # as they are related to a commit sha. This method helps importing - # them using the +Gitlab::ImportExport::ProjectRelationFactory+ class. + # them using the +Gitlab::ImportExport::Project::RelationFactory+ class. def notes=(notes) notes.each do |note| note[:id] = nil diff --git a/app/models/repository.rb b/app/models/repository.rb index cddffa9bb1d..a53850bb068 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -139,6 +139,7 @@ class Repository repo: raw_repository, ref: ref, path: opts[:path], + author: opts[:author], follow: Array(opts[:path]).length == 1, limit: opts[:limit], offset: opts[:offset], |