summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-05-02 14:35:04 +0100
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-05-04 17:33:26 +0200
commitbddbcaefc2389e4c61763472cecbea150f10cd75 (patch)
tree38ba599beed53505dfca09fce7a890bf3b125bb3 /lib/api
parent7603beffc916d06039cac63b223d8e6234b5d666 (diff)
downloadgitlab-ce-bddbcaefc2389e4c61763472cecbea150f10cd75.tar.gz
Backports every CE related change from ee-44542 to CE
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/entities.rb1
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