diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-02 22:16:54 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-02 22:16:54 +0000 |
| commit | 70b927a55ca62f1219464182660877bcdefd55b0 (patch) | |
| tree | 23aa15039675ed3c9e536a739b74f6c2ed2e53ff /lib/api | |
| parent | 8f7fc44b63f728d4de9c2e57a1452c53fa02a642 (diff) | |
| parent | c2516115e391360055f733d40af8aff2af52196b (diff) | |
| download | gitlab-ce-70b927a55ca62f1219464182660877bcdefd55b0.tar.gz | |
Merge branch 'projects-api-import-status' into 'master'
Expose import_status in Projects API
Closes #19646
See merge request !11851
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 31da85e9917..ded5c65e303 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -100,6 +100,8 @@ module API expose :creator_id expose :namespace, using: 'API::Entities::Namespace' expose :forked_from_project, using: Entities::BasicProjectDetails, if: lambda{ |project, options| project.forked? } + expose :import_status + expose :import_error, if: lambda { |_project, options| options[:user_can_admin_project] } expose :avatar_url do |user, options| user.avatar_url(only_path: false) end |