diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-04 16:27:09 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-04 16:27:09 +0000 |
| commit | e8b116ab94828b1354cf50934f49f37f3b012da2 (patch) | |
| tree | aa69372ec06ab6d807f5c09d35b224311fdfcae9 /lib/api | |
| parent | 0065c449ff95cf6e0643bab17ed236c23207b537 (diff) | |
| parent | bddbcaefc2389e4c61763472cecbea150f10cd75 (diff) | |
| download | gitlab-ce-e8b116ab94828b1354cf50934f49f37f3b012da2.tar.gz | |
Merge branch '44542-move-import-specific-attributes-out-of-the-project-model-ce-port' into 'master'
Resolve "Move `import_status` out of `projects`"
See merge request gitlab-org/gitlab-ce!18688
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 086071161b7..a9bab5c56cf 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -136,6 +136,7 @@ module API def self.preload_relation(projects_relation, options = {}) projects_relation.preload(:project_feature, :route) + .preload(:import_state) .preload(namespace: [:route, :owner], tags: :taggings) end |